Merge branch 'master' of https://git-tails.immerda.ch/tails
commit3ccf2292f535720c2d9678a5d9c780c5f06f2db2
authorTails developers <tails@boum.org>
Mon, 21 Jul 2014 11:31:52 +0000 (21 13:31 +0200)
committerTails developers <tails@boum.org>
Mon, 21 Jul 2014 11:31:52 +0000 (21 13:31 +0200)
tree8693520857347eb59ec8fc8786a66b3f23bb0553
parentd255f62a6a512570fb7ac2e909888d1014bab1a2
parent804ee9d8232a524af00e54141edd6e07122af40b
Merge branch 'master' of https://git-tails.immerda.ch/tails