Merge proposals dependent on lp:~raoul-snyman/openlp/bug-1212801-2.0

lp:~raoul-snyman/openlp/bug-1212801-2.0 has no merge proposals.