Merge remote-tracking branch 'origin/doc/circumvention'
commitbeb63ce3699308cb3161d442a025d74f5137bd89
authorTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 20:28:51 +0000 (19 22:28 +0200)
committerTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 20:28:51 +0000 (19 22:28 +0200)
treeca3456f8b2a34f75acea56cc23e5064e62436dd9
parentd2bdd54e4ac3d5aa1d31314d0774eb53f91988db
parent47b80c240dac0bfee8b56bbceef435fc5b39c172
Merge remote-tracking branch 'origin/doc/circumvention'