Merge tag 'upstream/2.3.0'
authorAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 12:52:46 +0000 (14:52 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 12:52:46 +0000 (14:52 +0200)
commitecada98db1f1d3fe9bcc7812f0a0aab6a3bef06b
treedcfaabc5d411e59913003b33564b7fdcbfaf2e64
parent461589e2858131ae1eb7beda9cac24d59f44e667
parent35cc89086e8448b35b6cb59f82bc35cb6f9240b3
Merge tag 'upstream/2.3.0'

Upstream version 2.3.0