Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkjsf
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 12 Jun 2013 12:50:46 +0000 (14:50 +0200)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 12 Jun 2013 12:50:46 +0000 (14:50 +0200)

Trivial merge