Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:06:28 +0000 (11:06 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:06:28 +0000 (11:06 +0100)
* maint:
  gitignore: use only one .gitignore file, in the top-level directory
  tests: one more fixlet for gettext macros requirement
  tests: fix handling of gettext macros requirement

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge