Merge branch 'master' into feature/better_task_manager
commitf24bcbdb8a5d5809def58d797ac0914c86d19f21
authorTails developers <amnesia@boum.org>
Thu, 18 Jul 2013 05:42:06 +0000 (18 07:42 +0200)
committerTails developers <amnesia@boum.org>
Thu, 18 Jul 2013 05:42:06 +0000 (18 07:42 +0200)
tree1540b774b981ef2dcc0fd5a3a2893fe544eacdc3
parent91cf3f6696ba324750523acaee2e45c1f83c29e3
parent3319524bafefe0e7bf3c0e131fe09945e849bef8
Merge branch 'master' into feature/better_task_manager