From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Apr 2013 10:11:16 +0000 (+0200)
Subject: Merge branch 'vdr-next' into next
X-Git-Tag: v2.13-core68^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5259fab54427a6e39279aa6661db14f26974b94;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'vdr-next' into next

Conflicts:
	config/rootfiles/core/68/filelists/files
---

c5259fab54427a6e39279aa6661db14f26974b94