Merge branch 'MDL-50385-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 22:47:27 +0000 (06:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 22:47:27 +0000 (06:47 +0800)
commitc06749bdf3197550f0d2b5be0a32efe9956eb7ee
treec53b3b84f9ed2e86f5318f3dfcac1d2d5b78903d
parent187137aa23f034122f592af39360340d67c997ca
parent201a90938ef8fec7b854165fadf9360d8c1d9b8a
Merge branch 'MDL-50385-master' of git://github.com/merrill-oakland/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
version.php