]> 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: ff5e4ef 5b942f7)
Merge remote-tracking branch 'amarx/openvpn'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Jul 2014 12:02:57 +0000 (14:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Jul 2014 12:02:57 +0000 (14:02 +0200)

Trivial merge
Peter's tree of IPFire 2.x