From: Andre Noll <maan@systemlinux.org>
Date: Tue, 7 Apr 2009 14:17:01 +0000 (+0200)
Subject: Merge branch 'master' into rm_hook
X-Git-Tag: v0.1.3~15
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=0ca40f54698dc00d81e40f784e27628f8fe802c0

Merge branch 'master' into rm_hook
---

0ca40f54698dc00d81e40f784e27628f8fe802c0