Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 2 Apr 2014 13:10:50 +0000 (14:10 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 2 Apr 2014 13:10:50 +0000 (14:10 +0100)

Trivial merge