Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 17 Apr 2014 14:47:06 +0000 (15:47 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 17 Apr 2014 14:47:06 +0000 (15:47 +0100)

Trivial merge