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

[git repository hosting]

The following commit has been merged in the master branch:
commit f38d22c1f7138681f6e63062c4a6e5f07f6ed93c
Merge: 41b9105fd51e83643a4f2827dba0ce76fe940da6 46de910ecbe926c92162bb48c321b2ffb3c31f8b
Author: git repository hosting <gitosis at live.debian.net>
Date:   Fri Dec 31 14:07:28 2010 +0000

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


-- 
wiki-content