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

Trivial merge