[php-pear-phing/el6: 2/2] Merge branch 'master' into el6

[Christof Damian]

commit f61ca45eb0721d09993a92e82962457668be9959
Merge: c4a972c 62f747b
Author: Christof Damian <christof at damian.net>
Date:   Thu Apr 12 00:01:37 2012 +0200

    Merge branch 'master' into el6

 .gitignore          |    1 +
 php-pear-phing.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---