]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc48f66 9da0695)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorDirk Wagner <glotzi@ipfire.org>
Fri, 10 Feb 2012 19:46:44 +0000 (20:46 +0100)
committerDirk Wagner <glotzi@ipfire.org>
Fri, 10 Feb 2012 19:46:44 +0000 (20:46 +0100)

Trivial merge
IPFire 2.x development tree