]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a44790b 06f451c)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into groff
authorMatthias Fischer <fischerm@ipfire.org>
Sun, 1 Feb 2015 16:22:09 +0000 (17:22 +0100)
committerMatthias Fischer <fischerm@ipfire.org>
Sun, 1 Feb 2015 16:22:09 +0000 (17:22 +0100)

Trivial merge
Matthias' tree of IPFire 2.x