Merge branch 'master' into stable

79f898d3 · Tails developers · 752916c1 · 88db1291 · 79f898d3 · 79f898d3
Commit 79f898d3 authored Mar 05, 2012 by Tails developers
--- a/wiki/src/todo/usb_install_and_upgrade/todo.mdwn
+++ b/wiki/src/todo/usb_install_and_upgrade/todo.mdwn
--- a/wiki/src/todo/visual_identity.mdwn
+++ b/wiki/src/todo/visual_identity.mdwn
--- a/wiki/src/todo/vpn_support.mdwn
+++ b/wiki/src/todo/vpn_support.mdwn