Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
authorPradeep Nayak <pradeep@pradeep.(none)>
Wed, 3 Apr 2013 10:12:45 +0000 (15:42 +0530)
committerPradeep Nayak <pradeep@pradeep.(none)>
Wed, 3 Apr 2013 10:12:45 +0000 (15:42 +0530)

Trivial merge