Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 8 Apr 2014 10:55:38 +0000 (11:55 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 8 Apr 2014 10:55:38 +0000 (11:55 +0100)

Trivial merge