Merge branch 'MDL-52217-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:56:02 +0000 (05:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:56:02 +0000 (05:56 +0800)
commit187137aa23f034122f592af39360340d67c997ca
tree3e44eb7393954c339d1266494f5b8309c836d655
parent44ad0f2c8d5b9be918d2f599a200f1ea56f7ff2f
parenta9e12347b790abc321817c3262f97b029d7905e2
Merge branch 'MDL-52217-master' of git://github.com/andrewnicols/moodle

Conflicts:
repository/upgrade.txt
lib/db/upgrade.php
repository/upgrade.txt