adding some params to clickatell inbound function to avoid strict warning
Merge branch 'master' of git://github.com/civicrm/civicrm-core
CRM-12291 done
Merge branch 'master' of github.com:michaelmcandrew/civicrm-core