[SCM] wiki-content branch, master, updated. 513f1b79ed6bd740eeaf8d0634a4569f36f13868

[Tails developers]

The following commit has been merged in the master branch:
commit 513f1b79ed6bd740eeaf8d0634a4569f36f13868
Merge: 6d112f17b2d11b982331a535a9737d97aeba9032 b561d4fa1af4b20d194366d0c3d714b2c8a15717
Author: Tails developers <amnesia at boum.org>
Date:   Wed Feb 15 11:28:31 2012 +0100

    Merge branch 'master' of live.debian.net:wiki-content


-- 
wiki-content