Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 26 May 2013 14:26:16 +0000 (16:26 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 26 May 2013 14:26:16 +0000 (16:26 +0200)
commitc609c97819458439748d095c0e3f9a6157840c3f
treef003c97aa090d5c73f2402dcf5a1baaced9a7e18
parent288aca61a0e72fef9874d017992bbdcabfbae67b
parent243dc7a09d2dcfff4e2988066252d3edfd203dd0
Merge branch 'xorg/maint' into xorg/master