]> 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: 15847a8 b1636ef)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Apr 2015 20:47:32 +0000 (22:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Apr 2015 20:47:32 +0000 (22:47 +0200)

Trivial merge
IPFire 2.x development tree