From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 3 Mar 2013 12:42:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'erik/sendEmail' into core67-merge
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2795e579303e847e245204fe48141444a66a9235;hp=2795e579303e847e245204fe48141444a66a9235

Merge remote-tracking branch 'erik/sendEmail' into core67-merge

Conflicts:
	make.sh
---