Arne Fitzenreiter a832f4f33e Merge remote-tracking branch 'origin/core60' into next ...

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

2012-06-01 17:30:54 +02:00

..

filelists

GeoIP: update database to 01052012.

2012-05-12 19:35:10 +02:00

exclude

started core59.

2012-05-12 19:24:46 +02:00

meta

started core59.

2012-05-12 19:24:46 +02:00

update.sh

Merge remote-tracking branch 'origin/core60' into next

2012-06-01 17:30:54 +02:00