.
Merge branch 'master' of github:parantapa/vim-snippets

Conflicts:
	snippets/php.snippets