Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 25 Mar 2014 22:54:04 +0000 (23:54 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 25 Mar 2014 22:54:04 +0000 (23:54 +0100)
commitfeeee7a3e81817d8abf324020cc7fc0b9425f657
tree4a8f148cf7621ce29206b698738bc7bfec5b3b91
parent84440b3e140b49e052d90d07631fe83d63e5e04a
parent2981f248b2db1adfdfbf4c294625bc382efe53fe
Merge branch 'xorg/maint' into xorg/master