Merge branch 'w25_MDL-26455_m26_installport' of git://github.com/skodak/moodle

Conflicts:
	admin/cli/install.php

diff --cc admin/cli/install.php
index 946cfcb,5578213..704be90
--- 1/admin/cli/install.php
--- 2/admin/cli/install.php
+++ b/admin/cli/install.php
@@@ -150,7 -151,7 +151,8 @@@ $CFG->docroot              = 'http://do
  $CFG->running_installer    = true;
  $CFG->early_install_lang   = true;
  $CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
 +$CFG->developerdebug       = true;
+ $CFG->dboptions            = array();
  
  $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
  $CFG->admin                = array_pop($parts);

diff --cc install.php
Simple merge