[zanata/zanata-parent] e284fa: Update

[GitHub]

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

  Changed paths:
    M .gitignore

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


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

  Changed paths:
    M .gitignore

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

Conflicts:
	.gitignore


Compare: https://github.com/zanata/zanata-parent/compare/8fe0761...90575d5