Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 16 Apr 2014 16:18:10 +0000 (12:18 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 16 Apr 2014 16:18:10 +0000 (12:18 -0400)

Trivial merge