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

[git repository hosting]

The following commit has been merged in the master branch:
commit d5d19c48d23187c4b6ccaf7bb5e5fbe7631c8c9e
Merge: f2e9a2fc5d7a94d1b77bf62d9c68d4cb079b8576 085eb367423e432c7ea41c6bbdcc9173307b284d
Author: git repository hosting <gitosis at live.debian.net>
Date:   Wed Dec 15 13:02:27 2010 +0000

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


-- 
wiki-content