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

[Christof Damian]

commit b1e0a07145576dc1c10a8da0c25f7759eeae4f5c
Merge: cf5e17d 7ec5805
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 28 14:09:38 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore           |    2 +-
 php-swift-Swift.spec |   13 +++++++++++--
 sources              |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 804e1ef,7dd21fe..b5a2e09
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--Swift-4.0.6.tgz
 -/Swift-4.1.1.tgz
 -/Swift-4.1.3.tgz
++Swift-4.1.3.tgz