]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 6 Dec 2012 18:29:29 +0000 (19:29 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 6 Dec 2012 18:29:29 +0000 (19:29 +0100)
commitd7a3254acedb43995d6a6e769562576cc7ff8639
treeb7b3f6fd553a46379ee926388248b511b0394135
parent2e732994a12431c6f7aa14876f358da90cfc9f32
parent36e1dc20f4d763b8069a4c973ef8ff792786229e
Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
config/rootfiles/common/stage2
make.sh
config/rootfiles/common/stage2
html/cgi-bin/vpnmain.cgi
lfs/stage2
make.sh