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

[Christof Damian]

commit 8b168ab6011c752266571f9e3f3176cd1532e964
Merge: bdf1165 ac6ad2c
Author: Christof Damian <christof at damian.net>
Date:   Thu Jul 25 17:06:55 2013 +0200

    Merge branch 'master' into f19

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