From: Richard Millet <remillet@berkeley.edu>
Date: Sat, 25 Aug 2012 00:08:16 +0000 (-0700)
Subject: Merge branch 'v2.6'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ad1e893135452d39e5541e8b97d5c5edb90fb068;p=tmp%2Fjakarta-migration.git

Merge branch 'v2.6'

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

ad1e893135452d39e5541e8b97d5c5edb90fb068
diff --cc 3rdparty/nuxeo/pom.xml
index 1703bb325,773efa9a5..65e7d1618
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@@ -14,9 -14,12 +14,12 @@@
      <name>services.3rdparty.nuxeo</name>
  
      <modules>
 -        <module>nuxeo-platform-collectionspace</module>
 +		<module>nuxeo-platform-collectionspace</module>
  		<module>nuxeo-platform-quote-api</module>
  		<module>nuxeo-platform-quote</module>
+ 		<!-- REM : 8/23/2012 - Disabled due to integration and dependency issues between ImageMagick and Ghostscript on Linux machines
+ 		<module>nuxeo-platform-thumbnail</module>
+ 		-->
  	</modules>
  
      <dependencies>