]> 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: e6353c5 9b6f6f2)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Jul 2010 19:48:35 +0000 (21:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Jul 2010 19:48:35 +0000 (21:48 +0200)

Trivial merge
IPFire 3.x development tree