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

[git repository hosting]

The following commit has been merged in the master branch:
commit ba1d97c5980327d9e2901d9e3c73cadb3a7b06b3
Merge: d5acc0f1a6e4aaa57d78745d52623aab9f005e85 d1ba5a30b3bbaa713bc0e16f8bf3efb9908c38e5
Author: git repository hosting <gitosis at live.debian.net>
Date:   Mon Oct 4 09:09:00 2010 +0000

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


-- 
wiki-content