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

Trivial merge