Merge branch 'master' into testsuite-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:05:24 +0000 (11:05 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 24 Dec 2011 10:05:24 +0000 (11:05 +0100)
commita3f66de9d0d0126dbefb08a69ea2a326fc6a6649
treed02830a60166bb106bee178b39fa528659d9f33c
parentc3bcf99ccfdb499e0e97128910a5d920ab5338f0
parente3351076de09b744d3387699fa20f1ec85f9ba58
Merge branch 'master' into testsuite-work

* master:
  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
.gitignore
ChangeLog
tests/gettext-macros.test