[php-swift-Swift/f18: 5/5] Merge branch 'master' into f18

[Christof Damian]

commit ed99da6b1f976e8a681cf51868d759caa1477009
Merge: 5f12d09 e29daf8
Author: Christof Damian <christof at damian.net>
Date:   Wed Oct 31 20:25:38 2012 +0100

    Merge branch 'master' into f18

 php-swift-Swift.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---