Support for MAMP 2.1.2 and PHP 5.4.10
Merge branch 'master' of github.com:majksner/php-memcached-mamp

Conflicts:
	README.textile