]> 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: e5d406a 6de056b)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Sep 2012 14:14:03 +0000 (16:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Sep 2012 14:14:03 +0000 (16:14 +0200)

Trivial merge
IPFire 2.x development tree