Merge branch 'CRM-13187-b' of git://github.com/vivekarora/civicrm-core into pull...
authorTim Otten <totten@civicrm.org>
Mon, 2 Sep 2013 19:26:58 +0000 (12:26 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 2 Sep 2013 19:26:58 +0000 (12:26 -0700)
commit68204259c860e04f223aba4e8327eb7e5a968b67
treec14fdcc393cb9fc649d38d2630ba00b489e292d2
parent9b51dabca0f4457fc4cb1ee24dbe60a49e1afbe5
parent51900a630990035f8b775411368a25760b68af0b
Merge branch 'CRM-13187-b' of git://github.com/vivekarora/civicrm-core into pull-request-1571