Merge tag 'upstream/1.9'
authorgregor herrmann <gregoa@debian.org>
Thu, 13 Jun 2013 16:07:11 +0000 (18:07 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 13 Jun 2013 16:07:11 +0000 (18:07 +0200)
commita6aa5f1fef8ad8b57da56a9a0c1cb99f535a65db
treef0b98576250abd6ab93e70ab79630fb761eb7cc2
parent8352849253b93e3f5fbdcea381f1d48cebb00b23
parentab6bb3875d1b25bc2a713abe9899042c37bce714
Merge tag 'upstream/1.9'

Upstream version 1.9