Merge remote-tracking branch 'origin/core60' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Jun 2012 15:30:54 +0000 (17:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Jun 2012 15:30:54 +0000 (17:30 +0200)
commita832f4f33ef12cd4245b5d50bc98b05db2dae2ca
treecc34eae05e858b8718fa4bc51f2398788cf914be
parent3648650e7628193cf271c984e7fcafa7dd59fe04
parent1346863ac7cbf67b38d6209a6b0ab3bab565386c
Merge remote-tracking branch 'origin/core60' into next

Conflicts:
config/rootfiles/core/59/update.sh
lfs/strongswan
make.sh
config/rootfiles/core/59/update.sh
make.sh