civicrm/civicrm-core — pull request #2604 by totten (2014-03-04 01:12:08+00:00)
Title: Merge forward (master => doctrine)

There were a bunch of weird conflicts (eg Civi/*php deleted in master branch), but I think this handles it properly.