]> 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 | compact (merge: 2444cc9 5520be2)
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
authorChristian Schmidt <maniacikarus@ipfire.org>
Mon, 1 Aug 2011 17:08:35 +0000 (19:08 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Mon, 1 Aug 2011 17:08:35 +0000 (19:08 +0200)
Conflicts:
html/cgi-bin/vpnmain.cgi


Trivial merge
Timo's tree of IPFire 2.x