Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 26 Jun 2013 15:33:40 +0000 (17:33 +0200)
committerMike Taylor <mike@indexdata.com>
Wed, 26 Jun 2013 15:33:40 +0000 (17:33 +0200)

Trivial merge