ooici/epu — pull request #20 by labisso (2013-07-03 20:42:04+00:00)
Title: EPUM instance update conflicts

Fixes OOIION-1108: poor handling of conflicts during instance updates.