]> 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: 826c22d 4c96235)
Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)

Trivial merge
Peter's tree of IPFire 2.x