[zanata/zanata] 9edeec: Merge commit 'f725507ec8b19a54ac3ff606efb0526286f9...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 9edeec2c158f8d8dc12246e420af5aff5c735907
      https://github.com/zanata/zanata/commit/9edeec2c158f8d8dc12246e420af5aff5c735907
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Log Message:
  -----------
  Merge commit 'f725507ec8b19a54ac3ff606efb0526286f9dd38'


  Commit: d84aa9b175249a1ede2b94a5c01e80804af310b8
      https://github.com/zanata/zanata/commit/d84aa9b175249a1ede2b94a5c01e80804af310b8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Merge commit 'e72882b7778329fd021580e3b57f8eaed3f9c6d6'

Conflicts:
	CHANGELOG.md


Compare: https://github.com/zanata/zanata/compare/3646cc5...d84aa9b