Tim Bentley a54d02f81c Fix merges		2013-01-21 06:52:55 +00:00
..
openlp_core_lib	Fix merges	2013-01-21 06:52:55 +00:00
openlp_core_ui	Fix merges	2013-01-21 06:52:55 +00:00
openlp_core_utils	Fix failing get_data_path_with_custom_location_test()	2013-01-07 14:05:19 +02:00