Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 23 Sep 2014 09:39:53 +0000 (11:39 +0200)
committerMike Taylor <mike@indexdata.com>
Tue, 23 Sep 2014 09:39:53 +0000 (11:39 +0200)

Trivial merge