[php-channel-phpdoc/f16: 2/2] Merge branch 'master' into f16

[Christof Damian]

commit 24d34dea0ba054b2a168199085488767ae72616f
Merge: 85a080d 164a5f4
Author: Christof Damian <christof at damian.net>
Date:   Thu May 24 21:26:56 2012 +0200

    Merge branch 'master' into f16

 channel.xml             |   16 ++++++++++
 php-channel-phpdoc.spec |   76 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 0 deletions(-)
---