]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'upstream/master' into CSPACE-5498
authorAron Roberts <aron@socrates.berkeley.edu>
Sat, 15 Dec 2012 01:48:39 +0000 (17:48 -0800)
committerAron Roberts <aron@socrates.berkeley.edu>
Sat, 15 Dec 2012 01:48:39 +0000 (17:48 -0800)
commit8d52469fd9c8f16aba17002abd3faf2332b40ded
treea10c5d284e7e1fe170262e3019a6d9d763c01950
parent1b21fc528273a6cef745209d9eb76df805c66ab3
parent2adb885671081ebfc99f93b1b14cb49857d4a3fd
Merge remote-tracking branch 'upstream/master' into CSPACE-5498

Conflicts:
3rdparty/nuxeo/nuxeo-platform-listener/build.xml
3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
3rdparty/nuxeo/nuxeo-platform-listener/build.xml
3rdparty/nuxeo/nuxeo-platform-listener/pom.xml