Merge branch 'master' into glassfish-version
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 25 Jun 2013 16:56:36 +0000 (12:56 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 25 Jun 2013 16:56:36 +0000 (12:56 -0400)
commit4a09a1c5c187c2ec84b4ac26ba284fffd4f89765
tree4eb7740a31adeda0f32a3fe7e73f8a82be00a7a7
parentcd63f324cf98a553f9cea33c50b0d68985552a8d
parentc04872faf566a8d312f5f3f82eb652fae7327ce3
Merge branch 'master' into glassfish-version

Conflicts:
pom.xml
pom.xml