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

[Christof Damian]

commit 90d26fa77bf8e55c545446d863d2193632432420
Merge: 2394db7 5ed7914
Author: Christof Damian <christof at damian.net>
Date:   Sat Apr 28 13:13:11 2012 +0200

    Merge branch 'master' into el6

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