]> 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: 03d0b8c 6d49c4a)
Merge remote-tracking branch 'ummeegge/OpenVPN' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:27:50 +0000 (18:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:27:50 +0000 (18:27 +0200)

Trivial merge
Timo's tree of IPFire 2.x