Merge remote-tracking branch 'origin/bugfix/additional-software-upgrade-failed-messag... jenkins-build_Tails_ISO_devel-63jenkins-build_Tails_ISO_devel-64jenkins-build_Tails_ISO_devel-65jenkins-build_Tails_ISO_devel-66jenkins-build_Tails_ISO_devel-67jenkins-build_Tails_ISO_devel-68jenkins-build_Tails_ISO_devel-69jenkins-build_Tails_ISO_devel-70jenkins-build_Tails_ISO_devel-71jenkins-build_Tails_ISO_devel-72jenkins-build_Tails_ISO_devel-73jenkins-build_Tails_ISO_devel-74
commit759e02ff714babe6177bcc7a907032758bc60297
authorTails developers <amnesia@boum.org>
Sat, 24 Aug 2013 13:46:30 +0000 (24 13:46 +0000)
committerTails developers <amnesia@boum.org>
Sat, 24 Aug 2013 13:46:30 +0000 (24 15:46 +0200)
tree7a36fc378a2961ecd9954f46e16484bbe5319c6a
parent76bdc173cb27faffb1ee34b3e78854adb6d8d17c
parent85f3e58a72e36fc10b2b695355ab59ee49460170
Merge remote-tracking branch 'origin/bugfix/additional-software-upgrade-failed-message' into devel