]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6646be5 57a3100)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Jun 2015 09:56:43 +0000 (11:56 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Jun 2015 09:56:43 +0000 (11:56 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Conflicts:
lfs/tor


Trivial merge
IPFire 2.x development tree