mraspaud/mpop — pull request #10 by pnuu (2014-06-03 07:41:38+00:00)
Title: Fixed failed merging

Removed "<<<<<<< HEAD" and ">>>>>>> upstream/pre-m...aster" lines to fix failed merging.