Merge remote-tracking branch 'origin/feature/tails-bugs' into stable
commit305ebe530dbaec79609cf6b7a040d707a443a781
authorTails developers <amnesia@boum.org>
Sun, 11 Aug 2013 22:39:49 +0000 (11 22:39 +0000)
committerTails developers <amnesia@boum.org>
Sun, 11 Aug 2013 22:39:50 +0000 (12 00:39 +0200)
tree0b18b62502460255ea7a00896788c20043693b85
parentf5c180e0149502764cbd8ed27304887bc85b911f
parent5e187b32e65f7c0e56e7c5fbc2b9d9852f99f9e4
Merge remote-tracking branch 'origin/feature/tails-bugs' into stable