aLaserShark/dangerzone — pull request #11 by aLaserShark (2013-03-28 20:23:54+00:00)
Title: Pull master to dev

A few misc changes there shouldn't be a problem.