Merge pull request #5654 from yourcelf/master
authorcolemanw <coleman@civicrm.org>
Wed, 8 Jul 2015 19:12:54 +0000 (15:12 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 8 Jul 2015 19:12:54 +0000 (15:12 -0400)
CRM-16294: Support map loading under https


Trivial merge