]> 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: b0a5e02 aa3b09a)
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Oct 2010 23:14:14 +0000 (01:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Oct 2010 23:14:14 +0000 (01:14 +0200)

Trivial merge
IPFire 3.x development tree