Merge xorg/maint into xorg/master.
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 24 Mar 2013 18:25:26 +0000 (19:25 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 24 Mar 2013 18:25:26 +0000 (19:25 +0100)
commit9981ccc71af6da6dc7f970d6c882f22966d72f4f
tree9c36897ba4e1d162a075c65122011edc22212bd6
parentff64abfdbc00bcfb5ccaae3b53c0b1ab7a5c54f5
parentf509dc33e76ef9909262bc6ef475cd54429d6359
Merge xorg/maint into xorg/master.