Merge remote-tracking branch 'origin/master' into stable
commit3609febd66ee8d1b8a9aeb695046db2a7f7de0b8
authorTails developers <amnesia@boum.org>
Wed, 20 Aug 2014 11:56:35 +0000 (20 11:56 +0000)
committerTails developers <amnesia@boum.org>
Wed, 20 Aug 2014 11:56:35 +0000 (20 11:56 +0000)
tree488883cab0d18b03fea3759979248e4f80c9a2f3
parent3c96bfb706897afc1d10a11750dcac0f9639930c
parent006a1ceb4dfae383cd9e88ec42a523da2c505dc0
Merge remote-tracking branch 'origin/master' into stable