Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 18:18:03 +0000 (20:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 18:18:03 +0000 (20:18 +0200)
commit161f995849e552964c53e456165fd31c4952ed79
tree363ac80cda7625d2bef2ee9139b5ad418fcd185a
parentdd0fa1adb1cf26205867c4158f3f034de90644d8
parentbde002b81ac2fe003cc2b1e1db6e90c231baf1fa
Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle

Conflicts:
admin/auth.php
lib/db/upgrade.php
version.php
admin/auth.php
backup/moodle2/backup_stepslib.php
lib/db/install.xml
lib/db/upgrade.php
lib/moodlelib.php
lib/upgrade.txt