Merge branch 'master' of github.com:m6w6/pharext

author Michael Wallner <mike@php.net>

Fri, 6 Mar 2015 19:03:45 +0000 (20:03 +0100)

committer Michael Wallner <mike@php.net>

Fri, 6 Mar 2015 19:03:58 +0000 (20:03 +0100)
author Michael Wallner <mike@php.net>
Fri, 6 Mar 2015 19:03:45 +0000 (20:03 +0100)
committer Michael Wallner <mike@php.net>
Fri, 6 Mar 2015 19:03:58 +0000 (20:03 +0100)
diff --cc bin/pharext

index 23a217c2b8bf5f6791afa02f5f702c6ce8dd950f,92f999c6eed4e2def9d03b533e9dd68a70c59fb6..90b28d17639f23164ba84d43d582041f46488042

Binary files differ
diff --cc src/pharext/Installer.php
Simple merge
author	Michael Wallner <mike@php.net>
	Fri, 6 Mar 2015 19:03:45 +0000 (20:03 +0100)
committer	Michael Wallner <mike@php.net>
	Fri, 6 Mar 2015 19:03:58 +0000 (20:03 +0100)
		1	2
bin/pharext	patch \|	diff1 \|	diff2 \|	blob \| history
src/pharext/Installer.php	patch \|	diff1 \|	diff2 \|	blob \| history