Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 9 Jul 2013 16:13:06 +0000 (17:13 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 9 Jul 2013 16:13:06 +0000 (17:13 +0100)

Trivial merge