Andrew Grimm - Heckle: we break code!#21

agrimm wants to merge 3 commits intosprk2012:mastersprk2012/sprk2012-cfp:masterfrom

agrimm:andrew_grimm-heckleagrimm/sprk2012-cfp:andrew_grimm-heckleCopy head branch name to clipboard