praekelt/sideloader — pull request #25 by calston (2014-07-23 12:39:26+00:00)
Title: Merge pull request #24 from praekelt/develop

Merge develop->master