From: Andre Noll <maan@systemlinux.org>
Date: Sat, 23 Apr 2011 13:54:59 +0000 (+0200)
Subject: Merge branch 't/crypt_cleanups'
X-Git-Tag: v0.4.7~14
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=32e646780461f96682d1191d31e08e4602ab125e;hp=32e646780461f96682d1191d31e08e4602ab125e

Merge branch 't/crypt_cleanups'

Conflicts:
	Makefile.in
---