Merge remote-tracking branch 'origin/master' into integration/master · zanata/zanata-api@f674cdd · GitHub

This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Merge remote-tracking branch 'origin/master' into integration/master

Browse files

Conflicts:
	pom.xml
	zanata-common-api/pom.xml

Loading branch information

Carlos A. Munoz committed May 13, 2014

2 parents 84990ee + 3334e5f commit f674cdd