Merge branch 'atif-shaikh-CRM-15979'
authorTim Otten <totten@civicrm.org>
Sat, 7 Mar 2015 00:14:56 +0000 (16:14 -0800)
committerTim Otten <totten@civicrm.org>
Sat, 7 Mar 2015 00:14:56 +0000 (16:14 -0800)

Trivial merge