Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Sat, 25 May 2013 02:36:30 +0000 (22:36 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Sat, 25 May 2013 02:36:30 +0000 (22:36 -0400)

Trivial merge