OpenLP

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

25bugfixes1
Merge into trunk

Proposed by Tomas Groth on 2016-03-13

Status:	Merged
Approved by:	Tomas Groth on 2016-03-15
Approved revision:	2631
Merged at revision:	2628
Proposed branch:	lp://qastaging/~tomasgroth/openlp/25bugfixes1
Merge into:	lp://qastaging/openlp
Diff against target:	239 lines (+76/-44) 7 files modified openlp/core/ui/exceptionform.py (+6/-4) openlp/plugins/custom/forms/editcustomform.py (+1/-0) openlp/plugins/songs/lib/importers/easyworship.py (+40/-32) openlp/plugins/songs/lib/mediaitem.py (+2/-2) tests/functional/openlp_plugins/songs/test_mediaitem.py (+2/-2) tests/interfaces/openlp_core_lib/test_pluginmanager.py (+9/-4) tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+16/-0)
To merge this branch:	bzr merge lp://qastaging/~tomasgroth/openlp/25bugfixes1
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tim Bentley		Approve on 2016-03-15
Raoul Snyman	2016-03-13	Approve on 2016-03-15
Review via email: mp+288872@code.qastaging.launchpad.net

Description of the change

Fix slide order change when splitting custom slides. Fixes bug 1554748.
Fix EasyWorship import issues with missing verses and traceback on unknown chars.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Pep8 fixes