Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 23 Mar 2014 10:44:39 +0000 (11:44 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 23 Mar 2014 10:44:39 +0000 (11:44 +0100)
commit84440b3e140b49e052d90d07631fe83d63e5e04a
treecfcb503cea386735829475ca4ec26825860bd406
parentf78f8e5731630912e476c196ad6e63de7e616d23
parent3ed513f3c581a2069f1e9e945b017812b2e7e767
Merge branch 'xorg/maint'