projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a408e02 0fffd0e)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Dec 2013 23:00:28 +0000 (00:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Dec 2013 23:00:28 +0000 (00:00 +0100)

Trivial merge
Timo's tree of IPFire 2.x