]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86dabf4 8052ad2)
Merge commit 'stevee/updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Aug 2010 12:33:27 +0000 (14:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Aug 2010 12:33:27 +0000 (14:33 +0200)

Trivial merge
IPFire 3.x development tree