Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 24 Jun 2013 13:22:47 +0000 (15:22 +0200)
committerMike Taylor <mike@indexdata.com>
Mon, 24 Jun 2013 13:22:47 +0000 (15:22 +0200)

Trivial merge