Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 16 Jun 2013 20:28:26 +0000 (22:28 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 16 Jun 2013 20:28:26 +0000 (22:28 +0200)
commitf418bc21872e7c34651bb4c4d2e3f6efccf395a1
tree8158ffe88266fca292dcf24b6df9dce264a4450e
parent57cf6dc4727703dedb3ff9ce489ce43201896ea2
parentb0c9ed52ba32da6e9514f74a4037f03c3539f793
Merge remote-tracking branch 'upstream/master'