]> 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: 80a47b7 6ab76be)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Aug 2009 21:09:30 +0000 (23:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Aug 2009 21:09:30 +0000 (23:09 +0200)

Trivial merge
IPFire 3.x development tree