Merge branch 'ddns-all-inkl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Aug 2013 08:41:27 +0000 (10:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Aug 2013 08:41:27 +0000 (10:41 +0200)
commit52a2f02f41d362b84d294a0b3239d93cd2010a14
tree5cf8bbfad478b8c2f8486981c7edfc379622d975
parent45aef0dd284b7dc7bdab4f26862446ece460b8f2
parent80002fe433b0a983fbee13c1f4ad6760596531f9
Merge branch 'ddns-all-inkl' into next

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