Merge branch 'aydun-CRM-16203' into 4.6
authorColeman Watts <coleman@civicrm.org>
Fri, 20 Nov 2015 00:40:57 +0000 (19:40 -0500)
committerColeman Watts <coleman@civicrm.org>
Fri, 20 Nov 2015 00:40:57 +0000 (19:40 -0500)
commit05839ccc1c721467fb2397b45572f160a542e4d3
treefd23c884cbf6c14126a29b4f404136c6b59714d6
parent28eb7872e710e9bc74613d10cc39efa3d87b9373
parent7c99af4f1104cecef61095d142fa19d181790cb9
Merge branch 'aydun-CRM-16203' into 4.6

Conflicts:
CRM/Report/Form.php
CRM/Report/Form.php