Merge branch 'master' of git://git.tails.boum.org/tails into stable
add press appearances
lists what's left to translate
(de) wiki translation for truecrypt
(de) wiki translation for truecrypt: poedit file header update
(de) wiki translation for truecrypt: language improvement
Merge branch 'master' into truecrypt
updating the faq
Merge branch 'master' of git://git.tails.boum.org/tails

Conflicts:
	wiki/src/support/faq.mdwn
Merge branch 'master' of git://git.tails.boum.org/tails
Merge branch 'master' into truecrypt
Passing those files through POedit before translating
tails 1.0 website translations
Merge branch 'master' of git://git.tails.boum.org/tails into translation
FAQ translation
Merge branch 'master' of git://git.tails.boum.org/tails into translation
initial translation
initial translation
missing underscores for trail
Merge branch 'master', remote branch 'origin'