Merge branch '1.5' of github.com:zanata/zanata into integration · zanata/zanata-server@ac42531 · GitHub

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

Commit

Merge branch '1.5' of github.com:zanata/zanata into integration

Browse files

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HPerson.java

Loading branch information

Carlos Munoz committed Mar 21, 2012

2 parents b2b6735 + f3e347c commit ac42531