Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Tue, 14 May 2013 20:15:19 +0000 (22:15 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 14 May 2013 20:15:19 +0000 (22:15 +0200)
commit95615c90e2eb9a6e246709bce79bc7fedd609736
treea46d931dcfb0f5a9876b6f458b703ed2be801fea
parentbb90a8bf7557bce71223ef66119a0dd98eecea91
parente73d13e14086b00435f0248d8d8a7df0885a771f
Merge remote-tracking branch 'upstream/master'