[php-symfony-symfony/el6: 4/4] Merge branch 'master' into el6

[Christof Damian]

commit 9fba2be476f6c5dc05e85d7215e160c07b110002
Merge: e4e1481 66ce325
Author: Christof Damian <christof at damian.net>
Date:   Mon Nov 26 21:09:09 2012 +0100

    Merge branch 'master' into el6

 .gitignore               |    1 +
 php-symfony-symfony.spec |   17 +++++++++++++++--
 sources                  |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---