Merge pull request #6455 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 07:45:53 +0000 (19:45 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 07:45:53 +0000 (19:45 +1200)
commit5f67fc0258a31c4fd811e85de1701780d84d435c
treee3808e02cd080cb4d130fb945f7e218eee9d4261
parent26e401dd151d41ca06229d1518f6b65d33e4c904
parent3febe800a5f92bc5904c0218c89b470318fae5ed
Merge pull request #6455 from eileenmcnaughton/master

CRM-16692 follow-up fix, move assumptions back to calling-form