NickHardeman/openFrameworks — pull request #6 by arturoc (2013-03-07 14:56:18+00:00)
Title: merge develop, again

sorry i broke it again this morning with some merges, if you can merge this one, i'll merge it into develop