]> 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 | compact (merge: 2f65e28 f8aa067)
Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:49:38 +0000 (20:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:49:38 +0000 (20:49 +0100)

Trivial merge
Timo's tree of IPFire 2.x