Merge pull request #1976 from eileenmcnaughton/CRM-13737
authorcolemanw <coleman@civicrm.org>
Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)
committercolemanw <coleman@civicrm.org>
Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)
CRM-13737 drupal integration allow drupal folder to be at the same level as the civicrm folder


Trivial merge