]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 725d809 f24237b)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Aug 2009 15:47:09 +0000 (17:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Aug 2009 15:47:09 +0000 (17:47 +0200)
Conflicts:
src/rootfiles/core/openvpn


Trivial merge
IPFire 3.x development tree