Merge openjdk-7 (7u121-2.6.8-2~deb7u1) import into refs/heads/workingbranch
authorEmilio Pozuelo Monfort <pochu@debian.org>
Tue, 7 Feb 2017 22:57:07 +0000 (22:57 +0000)
committerEmilio Pozuelo Monfort <pochu@debian.org>
Tue, 7 Feb 2017 22:57:07 +0000 (22:57 +0000)

Trivial merge