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

[git repository hosting]

The following commit has been merged in the master branch:
commit f2e9a2fc5d7a94d1b77bf62d9c68d4cb079b8576
Merge: f67ab61d36bbd6392a8a371b8fa0306253814600 955c987fcebf771bdfc9b19c699f33491b3dc46a
Author: git repository hosting <gitosis at live.debian.net>
Date:   Fri Dec 10 10:37:29 2010 +0000

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


-- 
wiki-content