plorry/gramework — pull request #1 by bartek (2013-03-07 01:54:52+00:00)
Title: Merge gamejam-deadline into master

I merged gamejam-deadline into master, and there were a bunch of conflicts so simply resolved them towards gamejam-deadline.

No other changes.