Merge branch 'master' into testing0.7-rc2
commitf2ff1f0b02821d31342b4b7258799371d5dd1a8b
authorTails developers <amnesia@boum.org>
Fri, 25 Mar 2011 15:17:23 +0000 (25 16:17 +0100)
committerTails developers <amnesia@boum.org>
Fri, 25 Mar 2011 15:17:23 +0000 (25 16:17 +0100)
tree7554fd56937565f19d9a6e5668e9525784049a71
parent77af7366452f931dcbea42ee9ea22afd508a34f8
parente8adad9b291c7dc5012ae9064481ab6e374ad8b9
Merge branch 'master' into testing