]> 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: 5720e50 7a538e7)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Sep 2010 21:40:04 +0000 (23:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Sep 2010 21:40:04 +0000 (23:40 +0200)

Trivial merge
IPFire 3.x development tree