[php-swift-Swift/f16: 2/2] Merge branch 'master' into f16

[Christof Damian]

commit 68cab3c7b9f7052b17755b070346a1637c6c7e4f
Merge: acfb185 5ed7914
Author: Christof Damian <christof at damian.net>
Date:   Sat Apr 28 12:40:59 2012 +0200

    Merge branch 'master' into f16

 .gitignore           |    1 +
 php-swift-Swift.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---