OpenLP

Merge lp://qastaging/~tomasgroth/openlp/25bugfixes3 into lp://qastaging/openlp

25bugfixes3
Merge into trunk

Proposed by Tomas Groth on 2016-06-15

Status:	Merged
Merged at revision:	2677
Proposed branch:	lp://qastaging/~tomasgroth/openlp/25bugfixes3
Merge into:	lp://qastaging/openlp
Diff against target:	263 lines (+81/-24) 9 files modified openlp/plugins/songs/lib/importers/mediashout.py (+18/-11) openlp/plugins/songs/lib/importers/opspro.py (+3/-3) openlp/plugins/songs/lib/importers/presentationmanager.py (+7/-1) openlp/plugins/songs/lib/importers/songpro.py (+1/-1) openlp/plugins/songs/lib/importers/songshowplus.py (+10/-4) openlp/plugins/songs/lib/importers/videopsalm.py (+1/-3) openlp/plugins/songs/lib/importers/worshipcenterpro.py (+1/-1) tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+2/-0) tests/resources/songshowplussongs/cleanse-me.json (+38/-0)
To merge this branch:	bzr merge lp://qastaging/~tomasgroth/openlp/25bugfixes3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Raoul Snyman		2016-06-15	Approve on 2016-06-15
Review via email: mp+297541@code.qastaging.launchpad.net

Description of the change

Fix various pyodbc related issues. Fixes bug 1590657.
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support.