]> 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: c0c9df1 cd0c0a0)
Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Sep 2011 17:40:44 +0000 (19:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Sep 2011 17:40:44 +0000 (19:40 +0200)
Conflicts:
html/cgi-bin/ovpnmain.cgi


Trivial merge
IPFire 2.x development tree