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

..

52

core52: stop/start squid at update.

2011-09-06 12:44:45 +02:00

53

Merge branch 'next'

2011-12-03 10:23:47 +01:00

54

core54: add credits.cgi.

2011-12-27 11:09:04 +01:00

55

core55: don't overwrite ssl/ssh config.

2012-01-05 15:20:28 +01:00

56

core56: add static-rules startfiles to updater.

2012-02-05 16:46:57 +01:00

57

core57: stop/start ipsec at update.

2012-04-07 11:21:31 +02:00

58

fix core58 merge problem.

2012-05-12 19:30:30 +02:00

59

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

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

60

Move core60 content to core61.

2012-06-01 17:25:10 +02:00

61

Move core60 content to core61.

2012-06-01 17:25:10 +02:00