git.vomp.tv Git - vompclient.git/commit

author	Marten Richter <marten.richter@freenet.de>
	Sun, 13 Jul 2014 12:56:10 +0000 (14:56 +0200)
committer	Marten Richter <marten.richter@freenet.de>
	Sun, 13 Jul 2014 12:56:10 +0000 (14:56 +0200)
commit	41fcefa88bc4aef0b0968b4a8fa83a7d95f2ad3f
tree	ba2827e892c5a838e59c33dbe1c9e9b0f44fc526	tree \| snapshot
parent	8c98eb914c52f958e7c0e382193f298d0206fa4d	commit \| diff
parent	0825f5b3f7b4c60682276ad22606f5f5a52f0578	commit \| diff

Merge branch 'master' of ssh://git.vomp.tv:20022/vompclient into scraper_support

Conflicts:
vdr.cc