Merge pull request #69 from mrclay/issue3765

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

Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)

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

Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)
author Cash Costello <cash.costello@gmail.com>
Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)
committer Cash Costello <cash.costello@gmail.com>
Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)
diff --cc engine/lib/elgglib.php
Simple merge
diff --cc languages/en.php
Simple merge
author	Cash Costello <cash.costello@gmail.com>
	Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)
committer	Cash Costello <cash.costello@gmail.com>
	Thu, 6 Oct 2011 23:58:22 +0000 (16:58 -0700)
		1	2
engine/lib/elgglib.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/en.php	patch \|	diff1 \|	diff2 \|	blob \| history