]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
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)
commitf99f4293e7ccb913105be165ddf25ea90bf676d4
treed7a4b602a143cbb95aadd0d202e20f333de8cb47
parent2444cc97804bbb9874fd2145f596c9d92d540b81
parent5520be2f215bcf904d413a77242a0209829ada36
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

Conflicts:
html/cgi-bin/vpnmain.cgi