Merge remote-tracking branch 'frithjof/master'
commit0ccd058e7844e0e6f00a60ae6a9cdcd0e06db110
authorTails developers <amnesia@boum.org>
Wed, 8 Jan 2014 12:06:30 +0000 (8 12:06 +0000)
committerTails developers <amnesia@boum.org>
Wed, 8 Jan 2014 12:06:30 +0000 (8 12:06 +0000)
tree64c6fd429b132c5041d41d07a010ca628a24f96b
parenta6d7d2cbe79b78c29694bace0b96f6c4b7e7eb63
parent00b164e3530a8faf8f61c5ee8048890aded21947
Merge remote-tracking branch 'frithjof/master'