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

[git repository hosting]

The following commit has been merged in the master branch:
commit 5bfe5c42edb6c29c90a4998a7738de6c7c9d24b1
Merge: 4a725401c88ae93a2650e9ea4615fbac70a8849a 87615ca1294c226572066c612765130d95acb6cc
Author: git repository hosting <gitosis at live.debian.net>
Date:   Sun Nov 21 20:38:32 2010 +0000

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


-- 
wiki-content