MantisBT: master-2.0.x 5cdb27a3

Author Committer Branch Timestamp Parent
unknown unknown master-2.0.x 2011-07-16 03:30 master-2.0.x 1854508a
Changeset

Merge remote-tracking branch 'david.hicks/dbfixes' into db

Conflicts:
account_sponsor_page.php
core/relationship_api.php
manage_user_page.php

mod - account_sponsor_page.php Diff File
mod - admin/copy_field.php Diff File
mod - admin/move_db2disk.php Diff File
mod - api/soap/mc_api.php Diff File
mod - api/soap/mc_issue_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/file_api.php Diff File
mod - core/relationship_api.php Diff File
mod - core/user_api.php Diff File
mod - manage_user_page.php Diff File
mod - manage_user_prune.php Diff File
mod - print_bugnote_inc.php Diff File