[SCM] wiki-content branch, master, updated. 2c5329a90f312ffa10d13c32c908b4f9c4cde46d

[git repository hosting]

The following commit has been merged in the master branch:
commit 2b58ad637b5097d8de043676bf2644254a351c4d
Merge: 0090be6c74c49477856842a3c5a94a4d4c688e05 6e4fa4242e99061fcf62de5f4f87614d6a9494ed
Author: git repository hosting <gitosis at live.debian.net>
Date:   Thu Nov 25 22:30:21 2010 +0000

    Merge branch 'master' of /srv/debian.net/live-wiki/../live-git/repositories/wiki-content


-- 
wiki-content