openmrs/openmrs-core — pull request #613 by fouadz (2014-02-05 08:09:18+00:00)
Title: TRUNK-4114: Handle exception thrown by deletion of referenced role and m...

...erge conflicts