Merge remote-tracking branch 'mercedes508/master'
commit99bd73f64cd1ee18f8ba38a39615bfafeed76d88
authorTails developers <amnesia@boum.org>
Thu, 28 Aug 2014 15:08:11 +0000 (28 15:08 +0000)
committerTails developers <amnesia@boum.org>
Thu, 28 Aug 2014 15:08:11 +0000 (28 15:08 +0000)
treea140a112d400e247e5162862ad7578429e20963e
parent4a002dabbd18223dffe2152c71392131491fef72
parentaea90020583b2113f595a931213733250f759111
Merge remote-tracking branch 'mercedes508/master'