projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec98573 3359057)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 9 Nov 2013 13:33:16 +0000 (14:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 9 Nov 2013 13:33:16 +0000 (14:33 +0100)

Trivial merge
Timo's tree of IPFire 2.x