Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 10 Mar 2014 17:59:32 +0000 (18:59 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 10 Mar 2014 17:59:32 +0000 (18:59 +0100)
commitdca40482d4839e7e365bd60a892a1e5de2d5d7a1
tree0c9b68658a99f239f84e57c74998af071a152347
parent96b778a679b261235ede8c5c4e7356680f4e5895
parent2c5e924a54d4cdef26f71f7018449b938f34fd22
Merge branch 'xorg/maint'