Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 5 May 2013 19:47:21 +0000 (21:47 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 5 May 2013 19:47:21 +0000 (21:47 +0200)
commitf3da6853488109414928beba98fa9a411c3c41ac
tree80f70545e9a0695329b4c958879a7bc81f10e1d1
parent17a105fd8a08e060ec667d825f524751effda522
parent5804e15859aee23e9af2fd4bd917c4c5fbc29372
Merge remote-tracking branch 'upstream/master'