Merge branch 'MDL-46182' of https://github.com/NeillM/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:28:19 +0000 (11:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:28:19 +0000 (11:28 +1300)
1  2 
lib/db/upgrade.php

Simple merge