Edited theme/nonzero/style/core.css via GitHub
Fix for MDL-25565
Merged MDL-25565 PULL-451 and fixed conflicts
Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle
Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle
Merged PULL-480/MDL-24877 and bumped version number to fix conflict
Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle
Merged PULL-496/MDL-26859 and fixed incorrect defines
Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle
Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle
Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle
Merge branch 'wip-MDL-26822'