Merge branch 'master' of ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2...
authorbetonme <glaserfrank(at)gmail.com>
Fri, 7 Nov 2014 18:34:47 +0000 (19:34 +0100)
committerbetonme <glaserfrank(at)gmail.com>
Fri, 7 Nov 2014 18:34:47 +0000 (19:34 +0100)
commit3505db6d9f5e2e35ecdb4d590ca72db6bdb84e55
tree04207f27192b24575736f94777734f3709e12dbe
parent94cfb0dce149c08a8cd995c55bae653933c8c7d4
parent33316ec80fabadac9d08a7433b821ecee7a46736
Merge branch 'master' of ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2-plugins/enigma2-plugins

Conflicts:
seriesplugin/po/de.po