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

[Christof Damian]

commit 7574f7c9cef002fb667a71efd7b2dfb15d793003
Merge: 90d26fa 83e1190
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 13 21:53:45 2012 +0200

    Merge branch 'master' into el6

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