Travis file fix
Conflict fix
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
Merge branch 'master' of github.com:0xd34df00d/leechcraft
[Aggregator] add rename feed possibility (fix #311)
Merge branch 'master' of github.com:0xd34df00d/leechcraft
[Core] Tab scroll buttons option isn't used anymore.
[LMP] Fixed playback label text.
[Popishu] Use SetLanguage() in selectDoctype().
[Popishu] Don't redetect doctype if it's already detected.
[Nacheku] Removed pre-automoc stuff.