]> 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: 8d7f5dc 41478e8)
Merge commit 'stevee/updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 May 2010 13:49:14 +0000 (15:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 May 2010 13:49:14 +0000 (15:49 +0200)

Trivial merge
IPFire 3.x development tree