From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 24 Nov 2010 20:04:25 +0000 (+0100)
Subject: Merge branch 'master' into pdf
X-Git-Tag: ALIT-2011~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09bf3393aca00455919f3b4ede80e4f0d7ad093e;p=talk-dvcs-git.git

Merge branch 'master' into pdf
---

09bf3393aca00455919f3b4ede80e4f0d7ad093e