Merge branch 'master' into phutil_tag

(Sync.)

Author: epriestley

conf/default.conf.php

@@ -1015,17 +1015,6 @@
   // interact with the revisions.
   'differential.anonymous-access' => false,
 
-  // If you set this to true, revision author email address information will
-  // be exposed in Conduit. This is useful for Arcanist.
-  //
-  // For example, consider the "arc patch DX" workflow which needs to ask
-  // Differential for the revision DX. This data often should contain
-  // the author's email address, eg "George Washington
-  // <gwashinton@example.com>" when DX is a git or mercurial revision. If this
-  // option is false, Differential defaults to the best it can, something like
-  // "George Washington" or "gwashington".
-  'differential.expose-emails-prudently' => false,
-
   // List of file regexps that should be treated as if they are generated by
   // an automatic process, and thus get hidden by default in differential.
   'differential.generated-paths' => array(

resources/ircbot/example_config.json

@@ -7,12 +7,12 @@
   ],
   "handlers" : [
     "PhabricatorIRCProtocolHandler",
-    "PhabricatorIRCObjectNameHandler",
-    "PhabricatorIRCSymbolHandler",
-    "PhabricatorIRCLogHandler",
-    "PhabricatorIRCWhatsNewHandler",
-    "PhabricatorIRCDifferentialNotificationHandler",
-    "PhabricatorIRCMacroHandler"
+    "PhabricatorBotObjectNameHandler",
+    "PhabricatorBotSymbolHandler",
+    "PhabricatorBotLogHandler",
+    "PhabricatorBotWhatsNewHandler",
+    "PhabricatorBotDifferentialNotificationHandler",
+    "PhabricatorBotMacroHandler"
   ],
 
   "conduit.uri" : null,

resources/sql/patches/20130131.conpherencepics.sql

@@ -0,0 +1,6 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_thread 
+  DROP imagePHID,
+  ADD imagePHIDs LONGTEXT COLLATE utf8_bin NOT NULL AFTER title;
+
+UPDATE {$NAMESPACE}_conpherence.conpherence_thread 
+  SET imagePHIDs = '{}' WHERE imagePHIDs = '';