Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 9 Sep 2014 12:44:03 +0000 (13:44 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 9 Sep 2014 12:44:03 +0000 (13:44 +0100)

Trivial merge