]> 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: 30b1c1c 3e82862)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 May 2014 20:47:13 +0000 (22:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 May 2014 20:47:13 +0000 (22:47 +0200)

Trivial merge
Peter's tree of IPFire 2.x