Arne Fitzenreiter 0fbba54e82 Merge branch 'master' into next ...

Conflicts:
	lfs/monit

2015-04-11 21:58:09 +02:00

..

common

Merge branch 'master' into next

2015-04-11 21:58:09 +02:00

core

core89: Update OpenVPN configuration during the update

2015-04-10 13:16:33 +02:00

oldcore

Move Core Update 86 and 87 files to oldcore directory

2015-03-05 12:55:32 +01:00

packages

Merge remote-tracking branch 'earl/tor' into next

2015-04-05 12:38:51 +02:00