Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/moviebrowser.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fac02ba45
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)
------------------
This commit was generated by Migit