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

[Christof Damian]

commit 909d934dfc1f8826e8019dc4d2e3b16cb134dbcf
Merge: 5adaf19 62f747b
Author: Christof Damian <christof at damian.net>
Date:   Wed Apr 11 23:51:42 2012 +0200

    Merge branch 'master' into f16

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