]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6f13fa da7ab3c)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 13:03:42 +0000 (14:03 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 13:03:42 +0000 (14:03 +0100)

Trivial merge
Timo's tree of IPFire 2.x