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

[Christof Damian]

commit 16960219eeb5981f7f3c580f1de9a74d505e648b
Merge: 5dcf192 62f747b
Author: Christof Damian <christof at damian.net>
Date:   Wed Apr 11 23:04:59 2012 +0200

    Merge branch 'master' into f17

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