]> 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: b283b2c c2f80e6)
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Aug 2014 07:36:31 +0000 (09:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Aug 2014 07:36:31 +0000 (09:36 +0200)

Trivial merge
Peter's tree of IPFire 2.x