Merge remote-tracking branch 'origin/bugfix/7175-openjdk-7' into testing
commit6a5fe77b154d13e36ac802a0d2f25d537ea04f6d
authorTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 18:51:30 +0000 (20 20:51 +0200)
committerTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 18:51:30 +0000 (20 20:51 +0200)
treedb40e8d14d9acff513a37feae82196d744537638
parentde847da2fb70e54a73aa94c66d14f76c25a6b787
parent2810b32f8beafa6932506d6bec8aced4403b7c18
Merge remote-tracking branch 'origin/bugfix/7175-openjdk-7' into testing