[zanata/zanata] ac4253: Merge branch '1.5' of github.com:zanata/zanata int...

[GitHub]

  Branch: refs/heads/1.5
  Home:   https://github.com/zanata/zanata
  Commit: ac4253135252713069ecb2c9fefe174ef9d26d3c
      https://github.com/zanata/zanata/commit/ac4253135252713069ecb2c9fefe174ef9d26d3c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

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

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