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

[Christof Damian]

commit e19d7439779e4abf1152860e17859f206d620f4c
Merge: b1e0a07 85b0c42
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 16:28:50 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

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