Merge branch 'master' into glassfish-version
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 13 Mar 2013 15:11:44 +0000 (11:11 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 13 Mar 2013 15:11:44 +0000 (11:11 -0400)

Trivial merge