Merge commit 'd62bf4c81273e91c9155c39373f6462b0acacbdf' into testing
commit1ada0453b80563631f2492ff839f4eeb92ce67fb
authorTails developers <amnesia@boum.org>
Sun, 1 Dec 2013 18:13:47 +0000 (1 18:13 +0000)
committerTails developers <amnesia@boum.org>
Sun, 1 Dec 2013 18:13:47 +0000 (1 18:13 +0000)
tree74c5f72e6b75bdd2b589dc9db8cea273be1a3620
parent7e44d42939dd9324b90eda7374ea6ec950e63759
parentd62bf4c81273e91c9155c39373f6462b0acacbdf
Merge commit 'd62bf4c81273e91c9155c39373f6462b0acacbdf' into testing