[php-channel-phing/el6: 6/6] Merge branch 'master' into el6

[Christof Damian]

commit 179e95da038c1634f7894bc602109d6d7fbece63
Merge: ee6d697 f370b39
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 21:00:12 2012 +0100

    Merge branch 'master' into el6

 channel.xml            |   32 ++++++++++++++++----------------
 php-channel-phing.spec |   14 ++++++++++++--
 2 files changed, 28 insertions(+), 18 deletions(-)
---