[php-pear-phing/f17: 3/3] Merge branch 'master' into f17

Fri Mar 2 21:02:27 UTC 2012

commit 5dcf1926ab8b101d180983376ff0bca0c05221f7
Merge: bbed056 a0eaa62
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 22:01:40 2012 +0100

    Merge branch 'master' into f17

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