]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/commitdiff
projects / people / ummeegge / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cded5e 00f9fa1)
Merge branch 'next' of ssh://git.ipfire.org/srv/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Sep 2012 12:06:57 +0000 (14:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Sep 2012 12:06:57 +0000 (14:06 +0200)

Trivial merge
IPFire 2.x development tree