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

[Christof Damian]

commit 90e072d957f2c77cf63b97ce5ed75cb160da53bd
Merge: 943524c ac6ad2c
Author: Christof Damian <christof at damian.net>
Date:   Thu Jul 25 17:15:35 2013 +0200

    Merge branch 'master' into el6

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