NickHardeman/openFrameworks — pull request #5 by arturoc (2013-03-06 10:04:01+00:00)
Title: merge develop to fix merging

i've merged latest develop into your branch. if you can merge this i'll merge it into develop later