Merge pull request #256 from dlobo/CRM-12212
authorcolemanw <coleman@civicrm.org>
Tue, 26 Mar 2013 18:41:41 +0000 (11:41 -0700)
committercolemanw <coleman@civicrm.org>
Tue, 26 Mar 2013 18:41:41 +0000 (11:41 -0700)
CRM-12122


Trivial merge