Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Tue, 30 Jul 2013 19:42:42 +0000 (21:42 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 30 Jul 2013 19:42:42 +0000 (21:42 +0200)
commitd74cc9927630b2d4825d719bc8b838b528015f95
treee4dd0bb4045271a56adc8a8bb1e510d2f6492452
parent4c478c1bb6a45488629e1f04a03dea4b5631954b
parentfc39de607cb258efac7cabe593b4dcfa094ae8b3
Merge remote-tracking branch 'upstream/master'