Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 22 Sep 2014 14:11:33 +0000 (16:11 +0200)
committerMike Taylor <mike@indexdata.com>
Mon, 22 Sep 2014 14:11:33 +0000 (16:11 +0200)

Trivial merge