Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 25 Jun 2013 12:17:42 +0000 (14:17 +0200)
committerMike Taylor <mike@indexdata.com>
Tue, 25 Jun 2013 12:17:42 +0000 (14:17 +0200)

Trivial merge