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

[Christof Damian]

commit 2394db76f6df4f5ed01d1f5afaa4aa2813a005a2
Merge: e19d743 cbe5446
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 24 15:48:45 2012 +0100

    Merge branch 'master' into el6

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