Merge branch 'master' of https://git-tails.immerda.ch/tails
commitb626749f3caf8a1a832a38cb361542b459ada70c
authorTails developers <tails@boum.org>
Tue, 12 Aug 2014 19:07:42 +0000 (12 21:07 +0200)
committerTails developers <tails@boum.org>
Tue, 12 Aug 2014 19:07:42 +0000 (12 21:07 +0200)
treef68155243b56ba91f72ca32753aa769b645f6b79
parent62a470006372c3a32d699749afd16042420245c5
parent94d4d8813c7c5797a47a567481432729d9244445
Merge branch 'master' of https://git-tails.immerda.ch/tails