Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 22 Oct 2014 14:59:30 +0000 (15:59 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 22 Oct 2014 14:59:30 +0000 (15:59 +0100)

Trivial merge