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

[Christof Damian]

commit 589cb1b54aa9d0e695e8a5b786c3f84129d7f0bd
Merge: c40d8ec 83e1190
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 13 21:38:37 2012 +0200

    Merge branch 'master' into f17

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