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)
commitea494841e1dca16c5d6f350ee69904a13ce3c763
tree810bfd2df3c85476df07b75d964913862b4730df
parent66b71d2227c5415730eb92d49dee6b15ce39b041
parent7a6c86eac349158a8c8fdb2b0b6325f3e7ed963c
Merge pull request #5654 from yourcelf/master

CRM-16294: Support map loading under https