Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 23 Feb 2012 15:48:18 +0000 (16:48 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 23 Feb 2012 15:59:44 +0000 (16:59 +0100)
commita0a63e7690b9124f966e87d7f5fc896cf6b9af17
tree9e50851f4e302f2c81a732fbc98bde5af19a9c63
parent1a1e7ab3f7cfe156152fb69961115a2c85b2a82d
parentb8fe7ca6f6559845c6f96657f52c7d24cd792317
Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  Fix Makefile.am compatibility with automake 1.11.2

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am