Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 28 May 2014 14:54:53 +0000 (15:54 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 28 May 2014 14:54:53 +0000 (15:54 +0100)

Trivial merge