projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4234ca5 935f311)
Merge remote-tracking branch 'ms/fifteen-theme' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Jan 2014 20:16:17 +0000 (21:16 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Jan 2014 20:16:17 +0000 (21:16 +0100)

Trivial merge
Timo's tree of IPFire 2.x