MantisBT: master f51e9565

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2013-10-09 04:10 master 6aa5e9b8
Changeset

Preparation for merge of 'dregad/13x' branch

This merges a few cherry-picked commits with the appropriate conflict
resolutions, to facilitate the merge of the whole branch later on.

After this, the only remaining conflicts are the issues with the
language files and api, which will be resolved after feedback from and
discussion with grangeway.
mod - core/helper_api.php Diff File
mod - core/html_api.php Diff File
mod - core/http_api.php Diff File
mod - core/print_api.php Diff File
mod - login_select_proj_page.php Diff File