Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 30 Nov 2012 08:54:47 +0000 (09:54 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 30 Nov 2012 08:54:47 +0000 (09:54 +0100)
commitc612f10b36afce432821101b4f6a919e3a9f2d22
tree250f8dc7bcaf304831851892d191ae7320ae42aa
parent946795ebddb2c2ff7f5e1ded6e084a934b59385a
parentc7fdb61130b1b8d68e6cca79dc50d1eb6777a3d0
Merge xorg/maint into xorg/master