knub/onehundredandeighty — pull request #10 by flxw (2013-09-02 15:45:59+00:00)
Title: Fix merger remains

Fixed the remaining "<<<<<<" from merge