]> 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: 5068ac3 d41f9e6)
Merge branch 'create-core-65' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Nov 2012 09:55:01 +0000 (10:55 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 Nov 2012 09:55:01 +0000 (10:55 +0100)

Trivial merge
Timo's tree of IPFire 2.x