Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/hub

author Roland Haeder <roland@mxchange.org>

Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)

committer Roland Haeder <roland@mxchange.org>

Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)
author Roland Haeder <roland@mxchange.org>
Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)
committer Roland Haeder <roland@mxchange.org>
Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)
diff --cc application/hub/config.php
Simple merge
diff --cc application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Tue, 11 Feb 2014 21:39:47 +0000 (22:39 +0100)
		1	2
application/hub/config.php	patch \|	diff1 \|	diff2 \|	blob \| history
application/hub/main/discovery/package/class_PackageRecipientDiscovery.php	patch \|	diff1 \|	diff2 \|	blob \| history