Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-17-13-40-23
authorkurund <kurund@civicrm.org>
Mon, 17 Nov 2014 08:10:30 +0000 (13:40 +0530)
committerkurund <kurund@civicrm.org>
Mon, 17 Nov 2014 08:10:30 +0000 (13:40 +0530)
commitd316b1e117e7f8215acc07b9d39e18f7aba1bf8c
tree96d8696e5d3b4486f23c17e828a168818db1d1c2
parent4b48b8168871d39b6ae6ef419b57e5a4bf4f0875
parent9d794c25d13dc35c377804ef2415e23a3c53e436
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-17-13-40-23
CRM/Event/BAO/Participant.php
CRM/Event/Form/Participant.php