]> 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: 6af27d7 ac3b630)
Merge remote-tracking branch 'ummeegge/openvpn'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:30:37 +0000 (19:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:30:37 +0000 (19:30 +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