From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 8 Oct 2009 18:49:19 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~703
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=b0324a5142a5cb047107ca54a1edead6e1b4d43b;hp=57a83359e84e0cf25c0de8be2e5c9248b5383e22

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/cron/crontab
---