Merge remote-tracking branch 'origin/bugfix/7807-remove-duplicate-openjdk-jre' into...
commitb3f717f55b1852980d9dd81a0b938cbcae05fb1d
authorTails developers <amnesia@boum.org>
Thu, 28 Aug 2014 21:22:37 +0000 (28 23:22 +0200)
committerTails developers <amnesia@boum.org>
Thu, 28 Aug 2014 21:22:37 +0000 (28 23:22 +0200)
tree275339036a507c5fb7807a83eb22af1eb917cb9a
parentdaed4c56b28b805d2b1e2b3d91fa0af1170fc21a
parentebd8f4438ed1853b334e9f70ba3c31b8fbaebe02
Merge remote-tracking branch 'origin/bugfix/7807-remove-duplicate-openjdk-jre' into stable