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

[Christof Damian]

commit c40d8ec4687c466fe455f1d8349be5f0a2b00bad
Merge: 27223b4 5ed7914
Author: Christof Damian <christof at damian.net>
Date:   Sat Apr 28 13:01:23 2012 +0200

    Merge branch 'master' into f17

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