From: Andre Noll <maan@systemlinux.org>
Date: Wed, 12 May 2010 09:04:36 +0000 (+0200)
Subject: Merge branch 't/unconditional_hooks'
X-Git-Tag: v0.1.4~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=f92d4b984e14d18f468151ac8596dc0159ff838e

Merge branch 't/unconditional_hooks'
---

f92d4b984e14d18f468151ac8596dc0159ff838e