]> 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: 43ea947 e3b3099)
Merge remote-tracking branch 'origin/master' into core78
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Jun 2014 06:42:56 +0000 (08:42 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 5 Jun 2014 06:42:56 +0000 (08:42 +0200)

Trivial merge
Peter's tree of IPFire 2.x