Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
authorkurund <kurund@civicrm.org>
Mon, 15 Dec 2014 19:38:16 +0000 (01:08 +0530)
committerkurund <kurund@civicrm.org>
Mon, 15 Dec 2014 19:38:16 +0000 (01:08 +0530)
commit1861d923dd4e29ac945caa98e1efbeda0bb71483
treeb0b5851441bbb4eb471713899ed1964eb4275aaf
parente06f1518e236dcfcf1d010aa523c28c455694554
parent939dc7753588c0ee09d547c13955af160168a5d3
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Page/View/UserDashBoard.php
CRM/Core/xml/Menu/Contact.xml
CRM/Price/Form/Option.php
CRM/Utils/System/Joomla.php