cms-analysis/flashgg — pull request #117 by sethzenz (2014-12-02 23:20:01+00:00)
Title: fix conflict in classes.h with previous PR

Replaces #115 by @malcles. It's the same except for one manually-removed conflict.