Merge branch 'master' into stable0.12.10.12.1-rc1
commit53573212c75e413ed44ec2dc3e49f01a47535b46
authorTails developers <amnesia@boum.org>
Tue, 3 Jul 2012 11:58:28 +0000 (3 13:58 +0200)
committerTails developers <amnesia@boum.org>
Tue, 3 Jul 2012 11:58:28 +0000 (3 13:58 +0200)
tree91f7e02fcc06d22051b1e7271049d4b02509ab58
parent61d27f59cfba87ffa5f5198261d6ead7311dc351
parentf6961953ea6585235f24986ab0d7ad798fa019f7
Merge branch 'master' into stable