[zanata/zanata-api] 4d0714: Update

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-api
  Commit: 4d0714506a5b528760d376d08f3ec72591284b50
      https://github.com/zanata/zanata-api/commit/4d0714506a5b528760d376d08f3ec72591284b50
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  Update


  Commit: 9f89b712411b8be1b3844649d2a65de097b984ed
      https://github.com/zanata/zanata-api/commit/9f89b712411b8be1b3844649d2a65de097b984ed
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M .gitignore
    A zanata-common-api/.gitignore
    M zanata-common-api/pom.xml

  Log Message:
  -----------
  Update .gitignore and git repo URL


  Commit: 36b219221cfbb8338451d726eaf57b5ca77317a8
      https://github.com/zanata/zanata-api/commit/36b219221cfbb8338451d726eaf57b5ca77317a8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Log Message:
  -----------
  Merge remote branch 'origin/master' into integration/master

Conflicts:
	.gitignore


Compare: https://github.com/zanata/zanata-api/compare/537dafa...36b2192