Merge remote-tracking branch 'origin/doc/sensitive_documents' into testing
commit59962b38bbb784df68509e6c3b7de2925aba883c
authorTails developers <amnesia@boum.org>
Mon, 14 Jul 2014 10:14:52 +0000 (14 10:14 +0000)
committerTails developers <amnesia@boum.org>
Mon, 14 Jul 2014 10:14:52 +0000 (14 10:14 +0000)
tree3d6b27cf0ab7af9552d191fc12bf2526a96acffb
parent565d03bba87cc5d8031cbb8143ee94ddcd6eb6a2
parent4388738cf17421b6f5593b88d989b0c822b19903
Merge remote-tracking branch 'origin/doc/sensitive_documents' into testing