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

[Christof Damian]

commit da62584f1337ee1fc0fbc045b38cc1a504194de9
Merge: 09a7cb5 85b0c42
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 16:02:36 2012 +0100

    Merge branch 'master' into f17

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