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

[git repository hosting]

The following commit has been merged in the master branch:
commit 1f86f125a6f57cc8c6ce70cb9760fafcc7cf6488
Merge: 7db0a7825d1e07f1b15a9407ed90fc0c99392502 f0b5f02a2eb94ffb651cbad33043fd31f54259a7
Author: git repository hosting <gitosis at live.debian.net>
Date:   Sun Sep 26 13:56:51 2010 +0000

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


-- 
wiki-content