merged branch stloyd/patch-1 (PR #1988)

Commits
-------

6e7c375 [FrameworkBundle] Cleanup schema file

Discussion
----------

[FrameworkBundle] Cleanup schema file a bit

Removed unused attributes, and added one missing.

src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

@@ -22,8 +22,7 @@
         </xsd:all>
 
         <xsd:attribute name="charset" type="xsd:string" />
-        <xsd:attribute name="error-handler" type="xsd:string" />
-        <xsd:attribute name="exception-controller" type="xsd:string" />
+        <xsd:attribute name="trust-proxy-headers" type="xsd:string" />
         <xsd:attribute name="ide" type="xsd:string" />
         <xsd:attribute name="secret" type="xsd:string" />
     </xsd:complexType>