From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 29 Mar 2011 09:35:19 +0000 (+0200)
Subject: Merge branch 'master' into pdf
X-Git-Tag: ALIT-2011~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e6dd20e6ee7d79294508409d6db5340d76983711;p=talk-dvcs-git.git

Merge branch 'master' into pdf
---

e6dd20e6ee7d79294508409d6db5340d76983711