Merge pull request #6675 from nganivet/CRM-17149
authorDave Greenberg <dave@civicrm.org>
Sat, 5 Sep 2015 15:42:34 +0000 (08:42 -0700)
committerDave Greenberg <dave@civicrm.org>
Sat, 5 Sep 2015 15:42:34 +0000 (08:42 -0700)
commitc9e0639595193269d4cddf1c4f05e1a341041174
tree591cf5ad669b33b569ef3d57e289dcb0f6eb4241
parent71ba5f88ed58db77e4e12d18180521c9049344aa
parent7332c9bd9d16f3a9e5da9322faa0c9baeff7fdb3
Merge pull request #6675 from nganivet/CRM-17149

CRM-17149: full fix