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)
commite635dbf4b99bee0a41bebc1ac4e93b2ae5f38188
tree80786643e6253a3d6b44c5f7bca4801df3d95600
parentc9e15d2aa437ac5401965a381e2528de36a4b546
parentb9871345b58bbb2bd67c070590499d411ffb213d
Merge branch 'master' of github.com:civicrm/civicrm-core into docstring-cleanup