]> 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: 2dcea58 3af3ecd)
Merge commit '3af3ecd319bdcf8db27e9ca14af72383b4754567' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 12 Oct 2013 19:01:13 +0000 (21:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 12 Oct 2013 19:01:13 +0000 (21:01 +0200)

Trivial merge
Timo's tree of IPFire 2.x