merge rel_3.x changes to trunk

copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php

@@ -27,12 +27,12 @@ class d3_googleanalytics_update extends d3install_updatebase
 
     // heredoc syntax using for class members is available from PHP 5.3 up
     public $sBaseConf =
-    "JycSFpDSXZYWEpRK1B2dERSbVg5VDVraUJ1VXBIOGpiY0NrY3M4Yzlrc1Q2Z2pPTms4SFRZODhGQTRwN
-05QWktLUUozaXhSVVM2eU9VdWdMdklpL2hrV29YMS9lY1BMOUVsYjBiMmJOKzFQSjgzRGlqOGlwMUVVN
-UxJY0plT3lBNkptc0VwcXNZT3YzY2hUTTB2QlF6RUIrbTJtVXRmNkppcTJreUJVd0xaUGI1RytmN1VkM
-zBaTjNxQkZ5dTg0c05qRUcreDV0WFo0WFZrWjlZd1ltMVpJOTQybDYvQkNDWmVPQzRSdHkrOXpwMld6a
-VVFTTBLWjRLTG1uT3k3ZUxXVUYwZlVCR2lQT0ZBWFRVZkd6UmtrOUN0bnFRczdzMnRudHAvMGttaGlhd
-EE9";
+    "3QUUzJvQ0pJTWcxNnpQNDZkL1JTTWVPTjZ2Q01FY0JsdTZXMjNoU0d4RE9vYmR0NUpsaG8xaGl5Y05TO
+G1idWZHbmRjdTF4MENadXpHSHNPYmRjeEJrQW1TT3JRYUd3VzJPMUUzaEw5ZFI1R1UwTmRoN2s5WXNIS
+TBaMEljeVZlRjdDZ2ZZZThRZWIvNDZVVEp2VGcxcUJzVG5yNkN1YTZvbkdjMFRnWUhnaVNWOFNpSzFNa
+Tk4cytwd3NSNUg4M3p0dUhuZEhKejBld255QnYrYktxdmo1b2c5RnE1Nm1KMDdnMlZVR2xSK2tNY3R2Z
+21pWEhRamVEZVNoU0wxN3l0WS9sMTdmeGZkMitreU44L0RuRU82WGVxRFBHNUNkKytscXEyVlUrZDB2a
+009";
 
     public $sRequirements = '';