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

[git repository hosting]

The following commit has been merged in the master branch:
commit 0bae858161113afd59d2365caf771a65bf404210
Merge: 82c7292bc087cf9e7c85f63c31ebf1ac4a73d7b5 4ca829293b21351f031bce2d5a1f7260c5057a70
Author: git repository hosting <gitosis at live.debian.net>
Date:   Sun Sep 26 13:50:56 2010 +0000

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


-- 
wiki-content