resolved strange repository conflicts
Authored by: goldluecke 2013-06-12
Parent: [r167]
Child: [r169]