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

[Christof Damian]

commit 5703e63dbb4234ae6a12417321029b02b70e9ae0
Merge: 4bde87d e29daf8
Author: Christof Damian <christof at damian.net>
Date:   Wed Oct 31 21:02:47 2012 +0100

    Merge branch 'master' into f16

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