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)
commit20a45564a27e178218c8118402a3642b1f530884
treee9ee1b73aa53f053705f7ee00ca29238db1b0216
parent5d9dbb9ba66a271e0659c3c7de5404992fa4ce46
parent73f73e4d0a0fc5eff99c51ab10a2b15241b1be23
Merge branch 'atif-shaikh-CRM-15979'