birdman
Merge branch 'master' of https://github.com/dslysenko/flaming-spice

Conflicts:
	flaming-spice.userprefs
userprefs :|