Merge branch 'master' of ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2...
authorbetonme <glaserfrank(at)gmail.com>
Sat, 8 Nov 2014 13:22:25 +0000 (14:22 +0100)
committerbetonme <glaserfrank(at)gmail.com>
Sat, 8 Nov 2014 13:22:25 +0000 (14:22 +0100)
commit65687a5bc1b0e1b4a60238d62118c44c21abdd38
treec007402abc8c82085babd10f6e772b71fdf4e974
parentf8333a349698dc8250acbee526a3158dd1cc8844
parent565d6c1e9a0224e459852484c276605510f870e2
Merge branch 'master' of ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2-plugins/enigma2-plugins

Conflicts:
seriesplugin/po/de.po