Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 22 Aug 2013 09:54:04 +0000 (10:54 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 22 Aug 2013 09:54:04 +0000 (10:54 +0100)

Trivial merge