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

[Christof Damian]

commit 4bde87dcbd3f3c928b9f0ffe753d4106b571c5d7
Merge: 68cab3c 83e1190
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 13 21:46:35 2012 +0200

    Merge branch 'master' into f16

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