Merge pull request #5101 from agh1/context-abbrev
authorcolemanw <coleman@civicrm.org>
Tue, 10 Feb 2015 14:25:46 +0000 (09:25 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 10 Feb 2015 14:25:46 +0000 (09:25 -0500)
CRM-15919 Address getoptions alternative: "abbreviate" context

1  2 
CRM/Core/DAO.php
CRM/Core/PseudoConstant.php

Simple merge
Simple merge