marc4j/marc4j — pull request #32 by atz (2013-04-02 04:37:40+00:00)
Title: Unresolved merge conflict got committed

This removes it