]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6ce1e7 79b2698)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Apr 2015 10:38:51 +0000 (12:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Apr 2015 10:38:51 +0000 (12:38 +0200)

Trivial merge
IPFire 2.x development tree