sricola/socode — pull request #214 by wmill (2013-04-23 04:58:57+00:00)
Title: Adding my function

Fixed merge conflict