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

Trivial merge