Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 14 Jun 2013 10:54:34 +0000 (11:54 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 14 Jun 2013 10:54:34 +0000 (11:54 +0100)

Trivial merge