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

[Christof Damian]

commit 3ad79846b7b08ba4d4b8b05e8ac5aaf0ebac1b1a
Merge: d51de0d 9d67034
Author: Christof Damian <christof at damian.net>
Date:   Mon May 21 22:16:55 2012 +0200

    Merge branch 'master' into el6

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