Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 1 Feb 2012 10:33:15 +0000 (11:33 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 1 Feb 2012 10:33:15 +0000 (11:33 +0100)
commite031b7efa485faf6f9f8419f6540c2a6530b9a61
tree9de1d9a69d15d83d40f34fa3bbf0df356187032d
parentee9506e1041e46200d28c367778c23ff02bc6b9a
parentc3e4962a9819b260a61e156f2105b58558af6396
Merge branch 'maint' into branch-1.11

* maint:
  cleanup: remove unused .am file