ok, back up to 305. WTF.
Merge branch 'master' of github.com:dlwh/puck
Merge branch 'master' into gpuqueue
dunno