Merge pull request #151 from cash/system_cache

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

Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)

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

Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)
author Cash Costello <cash.costello@gmail.com>
Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)
committer Cash Costello <cash.costello@gmail.com>
Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)
diff --cc engine/lib/elgglib.php
Simple merge
diff --cc install/ElggInstaller.php
Simple merge
diff --cc languages/en.php
Simple merge
author	Cash Costello <cash.costello@gmail.com>
	Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)
committer	Cash Costello <cash.costello@gmail.com>
	Wed, 25 Jan 2012 01:59:12 +0000 (17:59 -0800)
		1	2
engine/lib/elgglib.php	patch \|	diff1 \|	diff2 \|	blob \| history
install/ElggInstaller.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/en.php	patch \|	diff1 \|	diff2 \|	blob \| history