Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Oct 2009 18:49:19 +0000 (20:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Oct 2009 18:49:19 +0000 (20:49 +0200)
commitb0324a5142a5cb047107ca54a1edead6e1b4d43b
tree13b84cdc63466bdbb192437fe555f2eec8586864
parent57a83359e84e0cf25c0de8be2e5c9248b5383e22
parentb2a9871b2788acbaef90776837c579b7dd47fea8
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

Conflicts:
config/cron/crontab