Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15

Conflicts:
	templates/CRM/common/SocialNetwork.tpl

templates/CRM/common/SocialNetwork.tpl

@@ -45,7 +45,7 @@
             {*use advanced buttons for pages*}
             <div class="label">
                 <iframe allowtransparency="true" frameborder="0" scrolling="no"
-                src="//platform.twitter.com/widgets/tweet_button.html?text={$title}&amp;url={$url}"
+                src="//platform.twitter.com/widgets/tweet_button.html?text={$title}&amp;url={$url|escape:'url'}"
                 style="width:100px; height:20px;">
                 </iframe>
             </div>