Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 3 Dec 2014 14:25:00 +0000 (14:25 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 3 Dec 2014 14:25:00 +0000 (14:25 +0000)

Trivial merge