Merge branch 'CRM-15365' into 4.5
authorColeman Watts <coleman@civicrm.org>
Fri, 26 Sep 2014 20:45:30 +0000 (16:45 -0400)
committerColeman Watts <coleman@civicrm.org>
Fri, 26 Sep 2014 20:45:30 +0000 (16:45 -0400)
commit0e5a856011834bdf5616a1b9d340ebbc59185bbd
treedb930c613024bcd01cf2c936b4e4274774e01f79
parent029e72f2cbc8e189cf2494347aba92672d949020
parent5c8cb77fc8ab2c40d1197a5f034eec268915431d
Merge branch 'CRM-15365' into 4.5