Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 28 Jun 2013 11:37:11 +0000 (13:37 +0200)
committerMike Taylor <mike@indexdata.com>
Fri, 28 Jun 2013 11:37:11 +0000 (13:37 +0200)

Trivial merge