yes
Merge branch 'master' of https://github.com/volck/php

Conflicts:
	spillvelger.php