samuelduann/goshine — pull request #2 by zingvy (2014-11-26 06:06:35+00:00)
Title: fix conflict

....