Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 9 Mar 2014 19:58:50 +0000 (20:58 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 9 Mar 2014 19:58:50 +0000 (20:58 +0100)
commit768bcf433d125efdddeae47a055d0b4985529b88
tree08c641f83525b58c9db2c065717d92e6d5cb1a47
parente240b73ba7505fc8a4d0c4f61dd9b9b3b486c8d5
parentddec95b35f5434c80ce715d76467a61715f7f88a
Merge branch 'xorg/maint'