ziycon/SMF2.1 — pull request #1 by Antes (2014-05-21 23:19:51+00:00)
Title: Conflict Fix :P

I had some free time and resolved the conflict for you, still you need to test the functionality :(