Merge branch 'master' into recurring-activity-46
authorunknown <priyanka.karan26@gmail.com>
Tue, 4 Nov 2014 22:59:57 +0000 (22:59 +0000)
committerunknown <priyanka.karan26@gmail.com>
Tue, 4 Nov 2014 22:59:57 +0000 (22:59 +0000)
commite8cca51aa6ed1feb98786bd980a1395d8a9a785a
treea860c6b89a4fe677d634c955b703baa49ad1b0fd
parenta89bcc99702d8d3594cea053fe0e7b9aff6660f1
parent4215eb2bf07da543705e62c1cc8d38414a012ba0
Merge branch 'master' into recurring-activity-46

Conflicts:
CRM/Core/BAO/RecurringEntity.php
CRM/Core/Form/RecurringEntity.php
CRM/Core/Page/AJAX/RecurringEntity.php
CRM/Event/Form/ManageEvent/Repeat.php
templates/CRM/Core/Form/RecurringEntity.tpl
templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
CRM/Activity/BAO/Activity.php
CRM/Activity/Form/Activity.php
CRM/Activity/Selector/Search.php
CRM/Core/BAO/RecurringEntity.php
CRM/Core/Form/RecurringEntity.php
CRM/Core/Page/AJAX/RecurringEntity.php
CRM/Event/Form/ManageEvent/Repeat.php
templates/CRM/Activity/Form/Activity.tpl
templates/CRM/Core/Form/RecurringEntity.tpl
templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl