]> 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: 1a2bc2b 72cf605)
Merge remote-tracking branch 'stevee/tor-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:44:10 +0000 (22:44 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:44:10 +0000 (22:44 +0200)

Trivial merge
Timo's tree of IPFire 2.x