Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 8 Jul 2013 10:03:02 +0000 (11:03 +0100)
committerMike Taylor <mike@indexdata.com>
Mon, 8 Jul 2013 10:03:02 +0000 (11:03 +0100)

Trivial merge