Merge branch 'master' of git://git.tails.boum.org/tails
commita94a54b144630acc4851acd2e58533acc010d7ef
authorBessemer <bessemer@tormail.org>
Wed, 24 Jul 2013 20:34:17 +0000 (24 21:34 +0100)
committerBessemer <bessemer@tormail.org>
Wed, 24 Jul 2013 20:34:17 +0000 (24 21:34 +0100)
tree116f28152cdbcbb588e422919f956bc2e3708589
parente6aea1c347d52de157e038055e251c32827af5a6
parent25cd824ea1c0d02c8491e97928450d5cd971d588
Merge branch 'master' of git://git.tails.boum.org/tails
wiki/src/contribute/faq.mdwn
wiki/src/support/known_issues.mdwn