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

Merge branch 'master' into feature/wheezy

Conflicts:
	lib/Tails/IUK/Frontend.pm
parents bc994116 eb494418
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment