Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polyconseil.fr>
Thu, 19 Dec 2013 18:59:48 +0000 (19:59 +0100)
committerRaphaël Barrois <raphael.barrois@polyconseil.fr>
Thu, 19 Dec 2013 18:59:48 +0000 (19:59 +0100)
commit26dfc151be9647f572aa693e023670b670e61885
tree53dedef080e29ee81952ba2aa1cbaf2814de220a
parenta507867b187fd7621599e80a15724e670e737628
parent96a33c418b1f649ff548bae709f0588bd21a1edb
Merge branch 'xorg/maint' into xorg/master