]> 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: 0bad6c2 cf80de5)
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 May 2010 22:22:43 +0000 (00:22 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 May 2010 22:22:43 +0000 (00:22 +0200)

Trivial merge
IPFire 3.x development tree