Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-09-14-08-33
authorKurund Jalmi <kurund@yahoo.com>
Mon, 9 Nov 2015 08:38:47 +0000 (14:08 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 9 Nov 2015 08:38:47 +0000 (14:08 +0530)
commit7e0b07cc965bf046d593449ddfde15defe14cda5
tree4e696d158ebe102a185408b3ece933e7d4309204
parent7fadc48bddac75419d5d7afded9da2e0895114db
parentca4622bcaedef7b372302669256c7a335d8ce5ed
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-09-14-08-33
CRM/Admin/Page/Admin.php
CRM/Admin/Page/ConfigTaskList.php
CRM/Report/Form/Instance.php
templates/CRM/Admin/Page/Admin.tpl
templates/CRM/Admin/Page/ConfigTaskList.tpl
templates/CRM/Report/Form/Layout/Table.tpl