From: Andre Noll <maan@systemlinux.org>
Date: Tue, 25 May 2010 07:23:44 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.4.3~20
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=80ce39491e340c83d05c2fa433f5033bd7bd80d4;hp=04d57a4d05ce0a0f8d16c32d14d056e312527808

Merge commit 'meins/master'
---

diff --git a/web/images/paraslash.ico b/web/images/paraslash.ico
index f8b78169..860c5abd 100644
Binary files a/web/images/paraslash.ico and b/web/images/paraslash.ico differ