Merge remote-tracking branch 'origin/doc/tails-support-private'
commit4c154a9bfe2047f0920205b6c77d87811e9ade7d
authorTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 18:43:57 +0000 (24 18:43 +0000)
committerTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 18:43:57 +0000 (24 18:43 +0000)
treeb0870aa845a6cb9f57c21449eeb75e6089033485
parent8a2a7021faa17a91bc9055a90011ba24e71304bb
parenta60a345652556ee99cd7d110984c1dc75410c2e4
Merge remote-tracking branch 'origin/doc/tails-support-private'