N0U/spring — pull request #3 by abma (2013-11-18 00:31:03+00:00)
Title: (hopefully) fix merge mess

git diff looks good...