]> 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: eeef5fa ee299e2)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 10:02:42 +0000 (12:02 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 10:02:42 +0000 (12:02 +0200)

Trivial merge
Peter's tree of IPFire 2.x