Merge pull request #5453 from colemanw/CRM-16148

CRM-16148 - Show option names instead of ids in api explorer

diff --cc CRM/Core/DAO.php
Simple merge

diff --cc CRM/Core/PseudoConstant.php
Simple merge

diff --cc api/v3/Generic.php
Simple merge

diff --cc sql/civicrm_generated.mysql
index 5ed06297f7240e77536b3823802c1cb198bbe3fa,af2f2b54216f3aca7b3402422377267148cbf435..482a7dd0e7b86ffc29049501efdebabc2f2ce22b
--- 1/sql/civicrm_generated.mysql
--- 2/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@@ -1448,11 -1448,11 +1448,11 @@@ UNLOCK TABLES
  /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
  /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
  
- -- Dump completed on 2015-03-17 17:14:33
+ -- Dump completed on 2015-03-25 11:47:21
  -- +--------------------------------------------------------------------+
 --- | CiviCRM version 3.4                                                |
 +-- | CiviCRM version 4.6                                                |
  -- +--------------------------------------------------------------------+
 --- | Copyright CiviCRM LLC (c) 2004-2010                                |
 +-- | Copyright CiviCRM LLC (c) 2004-2015                                |
  -- +--------------------------------------------------------------------+
  -- | This file is a part of CiviCRM.                                    |
  -- |                                                                    |

diff --cc xml/templates/civicrm_data.tpl
Simple merge