Skip to content
Commit a86249bf authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'devel' into doc/wheezy

Conflicts:
	wiki/src/about.pt.po
	wiki/src/doc/first_steps/upgrade.fr.po
	wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po
	wiki/src/index.pt.po
parents 5281f87c 755cdb1e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment