Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into...
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Fri, 7 Jun 2013 16:53:21 +0000 (12:53 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Fri, 7 Jun 2013 16:53:21 +0000 (12:53 -0400)
commitcd63f324cf98a553f9cea33c50b0d68985552a8d
treeaa13c7bcb01947f784f46238a767dd8e6a42029b
parent0bd75b32a504b9e04c4ebc901b075a2be89ee359
parente935a98095cff863b692efd25946e7e3248f66d1
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into glassfish-version

Conflicts:
pom.xml
pom.xml