[php-channel-phpqatools/f17: 3/3] Merge branch 'master' into f17

[Christof Damian]

commit 3b24982184778367102602d5e576599aa82d628e
Merge: f15df54 b951a5c
Author: Christof Damian <christof at damian.net>
Date:   Mon May 21 20:48:17 2012 +0200

    Merge branch 'master' into f17

 channel.xml                 |   16 +++++++++
 php-channel-phpqatools.spec |   73 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 0 deletions(-)
---