Merge commit 'af5b1a73259eda8f2007a428c81daecfb115f0a3' into integrat…

…ion/master Conflicts: zanata-common-api/pom.xml
zanata · Oct 25, 2012 · 8e20e5b · 8e20e5b
2 parents af2bb38 + af5b1a7
commit 8e20e5b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/zanata-common-api/pom.xml b/zanata-common-api/pom.xml
@@ -113,6 +113,7 @@
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
+			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>