Merge branch 'devel' into testing0.23-rc1
commit169578a3a5d16db23ce8c40b9d0024b09c632b4b
authorTails developers <amnesia@boum.org>
Fri, 7 Mar 2014 00:19:33 +0000 (7 01:19 +0100)
committerTails developers <amnesia@boum.org>
Fri, 7 Mar 2014 00:19:33 +0000 (7 01:19 +0100)
tree769c9203d7bd8ee7a6c4fad0f5a2afaa5fe9ae2e
parent7977c26f0361aea74dc59762d4bfea89d53b22c4
parentaba712d6156bb880ba3abdf065a8827546625575
Merge branch 'devel' into testing