Merge remote-tracking branch 'origin/devel' into feature/6342-update-camouflage-for-gnome3
Merge branch 'master' of git://git.tails.boum.org/tails into translation
First stab at making the new NetworkManager configuration directory persistent, when the old one was.
Merge branch 'master' of git://git.tails.boum.org/tails into translation
(fr) FAQ: tiny fixes
(fr) FAQ: translations
(fr) translation gardening
(fr) fix link
(fr) tranlate index page
Merge branch 'master' of git://git.tails.boum.org/tails into translation
Merge branch 'master' of git://git.tails.boum.org/tails into translation
Merge remote branch 'matsa/translation' into translation
tiny fix on index page
adding test report for Tails 1.1~beta1
update tickets
Merge remote-tracking branch 'mercedes508/translation'
updated PO files
Link to the last batch of MFSA.
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
updated PO files