From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 May 2013 12:50:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/automake-update'
X-Git-Tag: pango~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69f50c3067fcadd4db91a39328a4f6e3a36dc9c5;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/automake-update'
---

69f50c3067fcadd4db91a39328a4f6e3a36dc9c5