From: root <root@conny.andreamanni.com>
Date: Fri, 5 Feb 2010 23:31:49 +0000 (+0100)
Subject: Merge branch 'master' of chrome:/home/git/doc
X-Git-Url: http://git.piffa.net/web?p=doc%2F.git;a=commitdiff_plain;h=187d47118425eee86b4472f145414f4c77086d14

Merge branch 'master' of chrome:/home/git/doc
---

187d47118425eee86b4472f145414f4c77086d14