CRM-11637 edit in place data-field=xx as an alternative for crmf-xx
CRM-9394
Merge pull request #175 from tttp/bugfix

CRM-11637 edit in place data-field=xx as an alternative for crmf-xx
Merge pull request #176 from yashodha/issue-9394

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