civicrm/civicrm-core — pull request #3857 by totten (2014-08-16 00:24:03+00:00)
Title: Docblocks and misc cleanup

Resolve conflicts & resubmit https://github.com/civicrm/civicrm-core/pull/2506