]> 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: 6666897 c125d8a)
Merge remote-tracking branch 'stevee/ovpnmain.cgi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 09:08:56 +0000 (11:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 09:08:56 +0000 (11:08 +0200)

Trivial merge
Timo's tree of IPFire 2.x