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

[Christof Damian]

commit c4a972c286fa19c5209024e2fa796b62e7934cc9
Merge: 16fe959 a0eaa62
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 22:29:46 2012 +0100

    Merge branch 'master' into el6

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