[php-pear-phing/f18: 5/5] Merge branch 'master' into f18

[Christof Damian]

commit 9753c757f833cb0c49e0d583fb58bdbde9c913a9
Merge: 9efeb3a b403e91
Author: Christof Damian <christof at damian.net>
Date:   Sat Apr 20 19:23:51 2013 +0200

    Merge branch 'master' into f18

 .gitignore          |    1 +
 php-pear-phing.spec |   14 ++++++++++++--
 sources             |    2 +-
 strip.sh            |   12 +++++++++++-
 4 files changed, 25 insertions(+), 4 deletions(-)
---