Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 3 Nov 2013 17:51:27 +0000 (18:51 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 3 Nov 2013 17:51:27 +0000 (18:51 +0100)
commitfaea3db3053e54bbf91cedba3f048396aa725af1
tree02ddf82e0fc578cd1c60c34d60ad57b8a89e5f1e
parentf1995a1ec228651bf26ebc4a5da19d55b932c45c
parent7b4bde3f565265cfe95f8a4ce1f9fec4f028e3fd
Merge branch 'xorg/maint'