Merge pull request #2987 from kurund/CRM-14276
authorKurund Jalmi <kurund@civicrm.org>
Mon, 28 Apr 2014 19:00:03 +0000 (12:00 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Mon, 28 Apr 2014 19:00:03 +0000 (12:00 -0700)
commit06c2aaf9ca2403bec424bf87c1b7ef9a9c24b1ab
tree71ed00c132bd0031244832ef27189bab28c290c9
parentef7c3e99a14d5cbb839efb0345900f3a31718e61
parent250b3b1f8022c5ca864be5ee009f3c0839957dd9
Merge pull request #2987 from kurund/CRM-14276

fatal error fixes due to bad merge CRM-14276