[SCM] wiki-content branch, master, updated. 7d4a2d5491f49586d94af962069428c4853d2a92

[chals]

The following commit has been merged in the master branch:
commit a502da81aaf82f9d5989a690d10e84cf23744f0a
Merge: 70b447bd2c534068e9204f0fc8c4c0fe3ba8f5db 5a9ba1dd97b68a24f169c5f1cc9560a3f9e9d16f
Author: chals <chals at altorricon.com>
Date:   Sat Jan 28 18:44:52 2012 +0100

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


-- 
wiki-content