Michael Tremer 52a2f02f41 Merge branch 'ddns-all-inkl' into next ...

Conflicts:
	config/rootfiles/core/72/filelists/files

2013-08-02 10:41:27 +02:00

..

70

kernel: update to 3.2.48.

2013-06-30 00:04:32 +02:00

71

dnsforward: add config to iso and updater.

2013-07-16 22:58:13 +02:00

72

Merge branch 'ddns-all-inkl' into next

2013-08-02 10:41:27 +02:00