Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Tue, 17 Dec 2013 14:00:21 +0000 (14:00 +0000)
committerMike Taylor <mike@indexdata.com>
Tue, 17 Dec 2013 14:00:21 +0000 (14:00 +0000)

Trivial merge