]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 601099d 10ad048)
Merge branch 'master' into core50
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
Conflicts:
config/rootfiles/core/50/filelists/icons


Trivial merge
IPFire 2.x development tree