]> git.ipfire.org Git - people/glotzi/ipfire-2.x.git/commitdiff
projects / people / glotzi / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c57561e 29afd40)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pound pound
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 3 Mar 2015 12:45:50 +0000 (13:45 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 3 Mar 2015 12:45:50 +0000 (13:45 +0100)

Trivial merge
Dirk's tree of IPFire 2.x