Merge remote-tracking branch 'matsa/master' into translation
commit658dba04585c8b34a4f8907122ff27a4ac2d91cb
authorTails developers <amnesia@boum.org>
Mon, 19 Jan 2015 16:48:02 +0000 (19 16:48 +0000)
committerTails developers <amnesia@boum.org>
Mon, 19 Jan 2015 16:48:02 +0000 (19 16:48 +0000)
tree2dae5cc7faf63155eacdb7a28affa44edb6a4267
parentefc84cde6b921351864fb43911703905cfb135d2
parentd2aefb872ccf5511bdaaf70a55ffda1d03e73340
Merge remote-tracking branch 'matsa/master' into translation
wiki/src/support/faq.fr.po