Merge branch 'master' of github.com:civicrm/civicrm-core into docstring-cleanup
authorRobert C. Sheets <rcsheets@acm.org>
Fri, 28 Mar 2014 06:20:33 +0000 (23:20 -0700)
committerRobert C. Sheets <rcsheets@acm.org>
Fri, 28 Mar 2014 06:20:33 +0000 (23:20 -0700)

Trivial merge