YeoLab/flotilla — pull request #148 by olgabot (2014-11-07 21:04:51+00:00)
Title: Merge master & dev, get rid of git-flow

address https://github.com/YeoLab/flotilla/issues/147