]> 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: 7eb3784 4cdf8b9)
Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Nov 2012 21:59:33 +0000 (22:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Nov 2012 21:59:33 +0000 (22:59 +0100)

Trivial merge
IPFire 2.x development tree