Ommit urlencode modifier to escape:'url' to fix CRM tests
Merge pull request #1848 from monishdeb/CRM-13625

CRM-13625 : Ommit urlencode modifier to escape:'url' to fix CRM tests
CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting
Merge pull request #1861 from totten/4.3-setting-warning

CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15

Conflicts:
	templates/CRM/common/SocialNetwork.tpl