Merge tag 'upstream/3.003'
authorgregor herrmann <gregoa@debian.org>
Mon, 20 Oct 2014 16:18:47 +0000 (18:18 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 20 Oct 2014 16:18:47 +0000 (18:18 +0200)
commit5d039fb861b8b9abcbe9abb9cb4ae9ee1c372231
treed3bab7055d123553a834a11838d7ddc087627775
parent0c36e45bcad0ef45d60da42c639e6c702ecca464
parent4eb97a35da64d5b6550d060052c76305b5a8cdfe
Merge tag 'upstream/3.003'

Upstream version 3.003