Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
authorPradeep Nayak <pradeep@pradeep.(none)>
Fri, 29 Mar 2013 12:15:25 +0000 (17:45 +0530)
committerPradeep Nayak <pradeep@pradeep.(none)>
Fri, 29 Mar 2013 12:15:25 +0000 (17:45 +0530)

Trivial merge