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

[git repository hosting]

The following commit has been merged in the master branch:
commit 41b9105fd51e83643a4f2827dba0ce76fe940da6
Merge: 05e69bb98a7035957728f86e473211fd743a08fe 4cf8a0f71c5601d8bd3a75c7e7040d93673e2239
Author: git repository hosting <gitosis at live.debian.net>
Date:   Tue Dec 28 18:59:07 2010 +0000

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


-- 
wiki-content