Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 13 Jun 2013 15:45:35 +0000 (16:45 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 13 Jun 2013 15:45:35 +0000 (16:45 +0100)

Trivial merge