[php-channel-digitalsandwich/f17: 2/2] Merge branch 'master' into f17

[Christof Damian]

commit 30008b2f52f5476c8631c6e46981ea96b19519c7
Merge: d51de0d 9d67034
Author: Christof Damian <christof at damian.net>
Date:   Mon May 21 21:24:15 2012 +0200

    Merge branch 'master' into f17

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