git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Tue, 30 Apr 2013 10:11:16 +0000 (12:11 +0200)
commit	c5259fab54427a6e39279aa6661db14f26974b94
tree	e1812ce63f6e42aac0cf450f894ddccbe8fe7dec	tree \| snapshot
parent	fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c	commit \| diff
parent	ea3224abc7b7cac5e7d40a8e89b629960e32ed2e	commit \| diff

Merge branch 'vdr-next' into next

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