Merge branch 'master' of github.com:civicrm/civicrm-core into code-cleanup-batch-15
authorpratikshad <pratiksha.dubey@webaccess.co.in>
Thu, 15 Jan 2015 12:40:43 +0000 (18:10 +0530)
committerpratikshad <pratiksha.dubey@webaccess.co.in>
Thu, 15 Jan 2015 12:40:43 +0000 (18:10 +0530)

Trivial merge