CRM-15075 fatal on membership renew with long text (plus this line seems just BAD)
-- CRM-15082, changed the function name

----------------------------------------
* CRM-15082: WSOD on advanced search when proximity search is performed
  https://issues.civicrm.org/jira/browse/CRM-15082
CRM-15086: remove {ts} on civicrm_option_value.name strings for: default conference slots, default batch type and default batch statuses.
Merge pull request #3800 from mlutfy/4.4-crm15086

CRM-15086: remove {ts} on a few civicrm_option_value.name strings
CRM-12722, added fixed that was missed during forward merging from 4.3 to 4.4

----------------------------------------
* CRM-12722: Group page only shows 25 child groups
  https://issues.civicrm.org/jira/browse/CRM-12722
Merge pull request #3801 from kurund/CRM-12722

CRM-12722, added fixed that was missed during forward merging from 4.3 t...
Merge pull request #3797 from pradpnayak/CRM-15082

-- CRM-15082, changed the function name
Merge pull request #3785 from eileenmcnaughton/CRM-15075

CRM-15075 fatal on membership renew with long text (plus this line seems...
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52

Conflicts:
	CRM/Member/Form/MembershipRenewal.php