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

[git repository hosting]

The following commit has been merged in the master branch:
commit 3e36d2b956c17f8d870ab8077f854f52a4e53c87
Merge: 3ed715f986c5d0814431542e15a6cc170e825930 6502e5f1cd05ee9c7ac5967cfa75bff6a752e646
Author: git repository hosting <gitosis at live.debian.net>
Date:   Fri Oct 1 20:16:59 2010 +0000

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


-- 
wiki-content