[gxml/serialization: 24/24] Merge remote-tracking branch 'origin/master' into serialization

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit c9e925278e00904a710917a3c4d89a2163d8b3ea
Merge: fc2852b 7d0fc9a
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Dec 3 10:02:15 2013 -0600

    Merge remote-tracking branch 'origin/master' into serialization
    
    Conflicts:
        gxml/Serializable.vala
        gxml/Serialization.vala
        test/DocumentTest.vala
    Keeps changes on Serializable and Serialization from serializable
    branch.

 test/DocumentTest.vala |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---