]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acac5f2 ad09461)
Merge remote-tracking branch 'ummeegge/openvpn'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:26:55 +0000 (16:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:26:55 +0000 (16:26 +0200)
1  2 
langs/en/cgi-bin/en.pl patch | diff1 | diff2 | blob | history

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