]> 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: 5ab9429 07271d6)
Merge commit 'stevee/updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Aug 2010 21:14:14 +0000 (23:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Aug 2010 21:14:14 +0000 (23:14 +0200)

Trivial merge
IPFire 3.x development tree