From: Pradeep Nayak <pradeep@pradeep.(none)>
Date: Wed, 3 Apr 2013 10:12:45 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b04aebf5b2f366cc48f36fa83a1d680615ccd52;p=civicrm-core.git

Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
---

1b04aebf5b2f366cc48f36fa83a1d680615ccd52