Merge branch 'master' of git+ssh://people.freedesktop.org/~alanc/xserver into next
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 15 Feb 2013 01:58:52 +0000 (11:58 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Fri, 15 Feb 2013 01:58:52 +0000 (11:58 +1000)
commit88517ced1fa2e621be2d05a319b522b3111da516
tree570fecb360df833ae7c1e5eb31dc3a33ed1ebf49
parent82425c66e7a8c436b5be7ad44880dd4be6c1f06a
parent73974dd7ea9ca4d4cdd5464cb813088a6ee9770b
Merge branch 'master' of git+ssh://people.freedesktop.org/~alanc/xserver into next