Merge remote-tracking branch 'origin/master' into testing0.22-rc2
commitae82ba215ca60fb6334758da7b4eba4d8731ce29
authorTails developers <amnesia@boum.org>
Sat, 7 Dec 2013 16:30:16 +0000 (7 16:30 +0000)
committerTails developers <amnesia@boum.org>
Sat, 7 Dec 2013 16:30:16 +0000 (7 16:30 +0000)
tree002483eaa7456514161af7533e41017231cd5dae
parent83e3662e682d2b4bcd4ac6c367a1a4e65fb63caf
parent9875902dca72a7c327a7320ddf52c7510e2c3184
Merge remote-tracking branch 'origin/master' into testing