Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkjsf
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:44:52 +0000 (16:44 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:44:52 +0000 (16:44 -0400)
commit1d3e5272a80d5890a3618912e6799f436dc2911b
tree3d935b71d79fc1b8ee3cffdd7e646b23ee08c80b
parenta58b9b5ee6608caaee5f793defb27fd2dbb485d8
parent97cbd726121a7743a7dbae6baabfc114c1ad9090
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkjsf

Conflicts:
pom.xml
pom.xml