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)
commit29e8f26d6b3731a3dde85d34e8d7edca48f1e4ea
treee9972ae52ea7cecb4785c6feee1ef848c39a09b6
parenta3309f02fb4217beceb714e64b4ca2bcd9bc1dae
parentbfc83bdec2e6e39a3275ae0c51b29a86603b49ad
Merge branch 'maint' into branch-1.11

* 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
ChangeLog