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

[git repository hosting]

The following commit has been merged in the master branch:
commit 29e8664226c799430d7f7563906d1969878dd6f3
Merge: a8e1cfb5a1238972258d27dbed5b28700421f94c 2f08a1cd3d6779cf94271fea6ad0718389536931
Author: git repository hosting <gitosis at live.debian.net>
Date:   Tue Nov 30 10:26:28 2010 +0000

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


-- 
wiki-content