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

[Christof Damian]

commit 6c499b5cbf334c6eb753ce414023248c2a692835
Merge: 7ec5805 85b0c42
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 16:17:13 2012 +0100

    Merge branch 'master' into f16

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