Merge remote-tracking branch 'origin/xorg/maint' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 17 Jun 2013 07:53:51 +0000 (09:53 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 17 Jun 2013 07:53:51 +0000 (09:53 +0200)
commitbb0d070949034c80c3ebd82d927e40663beb4c51
tree5cd7e5e4304bd1b0dae4201ff96187496e27452f
parentae7fd8ec1b7e658b737f25a96a20885d39119189
parentf9e8637a15063c845f976e4489e5535cf61143a9
Merge remote-tracking branch 'origin/xorg/maint' into xorg/master