Arne Fitzenreiter 8f6a5178e8 fix core58 merge problem. ...

Conflicts:

	config/rootfiles/core/58/filelists/files

2012-05-12 19:30:30 +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

core59: add openssl to core update.

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