[php-symfony2-HttpFoundation/el6: 2/2] Merge remote branch 'origin/master' into el6

[Shawn Iwinski]

commit 1b50180f79c5ceaa490844e717b036cc4e75ef02
Merge: a6630dc 0e6bf5e
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Fri Jun 14 10:40:14 2013 -0400

    Merge remote branch 'origin/master' into el6

 .gitignore                       |    1 +
 php-symfony2-HttpFoundation.spec |   14 ++++++--------
 sources                          |    1 +
 3 files changed, 8 insertions(+), 8 deletions(-)
---