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)

Trivial merge