fix CRM-12003
fix CRM-12003
Merge pull request #12 from dlobo/CRM-12003

Fix for CRM-12003
Merge branch 'master' of git://github.com/civicrm/civicrm-core into setup-conf-advice