]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57a8335 b2a9871)
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)
Conflicts:
config/cron/crontab


Trivial merge
Peter's tree of IPFire 2.x