]> 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: 7a2b5c6 0594323)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)

Trivial merge
Peter's tree of IPFire 2.x