Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 27 Jun 2014 10:19:54 +0000 (10:19 +0000)
committerMike Taylor <mike@indexdata.com>
Fri, 27 Jun 2014 10:19:54 +0000 (10:19 +0000)

Trivial merge