]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13eef3b c7220d6)
Merge branch 'ovpn_colour' of https://github.com/hadfl/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:32:18 +0000 (11:32 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:32:18 +0000 (11:32 +0200)

Trivial merge
IPFire 2.x development tree