projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ec8462 cd4a822)
Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Aug 2013 11:19:13 +0000 (13:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Aug 2013 11:19:13 +0000 (13:19 +0200)
1  2 
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

diff --cc langs/en/cgi-bin/en.pl
Simple merge
Timo's tree of IPFire 2.x