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)
commit0bd75b32a504b9e04c4ebc901b075a2be89ee359
treecc314f66a0cce283e33787f3af74063ab24bc36e
parentdd08c7e80f3f3e5c5a3c856bedbc04a665cdda92
parent0f4faab803c26eeebe511e9895013ecadfdd3ebe
Merge branch 'master' into glassfish-version