]> 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: 6ed30ec 1e2914a)
Merge branch 'next' into selinux
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Nov 2010 18:42:22 +0000 (19:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Nov 2010 18:42:22 +0000 (19:42 +0100)

Trivial merge
IPFire 3.x development tree