Merge pull request #2329 from davecivicrm/CRM-13726
authorDave Greenberg <dave@civicrm.org>
Mon, 13 Jan 2014 20:29:50 +0000 (12:29 -0800)
committerDave Greenberg <dave@civicrm.org>
Mon, 13 Jan 2014 20:29:50 +0000 (12:29 -0800)
commitb824d5c0a288d8c466a85715cdb8eac5e8b669ec
tree933b1149731760f855cdee70b26f4138ee2df682
parent2f7679961c18fe6f3fad1037f8a837eec64fc8cd
parent7d613bb787af016f0beedc4f039c80d078e81ebe
Merge pull request #2329 from davecivicrm/CRM-13726

CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaug...