montaggroup/montag — pull request #35 by dsk7 (2014-12-22 18:34:52+00:00)
Title: a little work on merge logic

removed old todo tag
added some unit tests
cleaned up some functions