Merge pull request #304 from sembrestels/donate-manifest

author Cash Costello <cash.costello@gmail.com>

Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)

committer Cash Costello <cash.costello@gmail.com>

Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)
author Cash Costello <cash.costello@gmail.com>
Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)
committer Cash Costello <cash.costello@gmail.com>
Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)
diff --cc engine/classes/ElggPluginManifest.php
Simple merge
diff --cc languages/en.php
Simple merge
diff --cc views/default/css/admin.php
Simple merge
author	Cash Costello <cash.costello@gmail.com>
	Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)
committer	Cash Costello <cash.costello@gmail.com>
	Tue, 17 Jul 2012 02:15:58 +0000 (22:15 -0400)
		1	2
engine/classes/ElggPluginManifest.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/en.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/default/css/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history