Michael Tremer 9063a04e94 Merge branch 'master' into fifteen ...

Conflicts:
	config/backup/backup.pl

2014-01-09 13:31:25 +01:00

..

common

Merge branch 'master' into fifteen

2014-01-09 13:31:25 +01:00

core

Merge branch 'master' into fifteen

2014-01-09 13:31:25 +01:00

installer

initrd: fix net and hid modules at installer.

2013-04-06 15:09:57 +02:00

oldcore

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

2013-12-30 13:55:34 +01:00

packages

Merge branch 'openssl-update' into fifteen

2013-12-27 13:32:38 +01:00