]> 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 | compact (merge: a0026a6 1164cb0)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Fri, 10 Apr 2015 14:36:57 +0000 (16:36 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Fri, 10 Apr 2015 14:36:57 +0000 (16:36 +0200)

Trivial merge
Matthias' tree of IPFire 2.x