Merge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 07:29:41 +0000 (09:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 07:29:41 +0000 (09:29 +0200)
commit7bd5ce57d87cdfec360d236c59fe5f9143dfa238
tree2f64af7a0684f860395809d43756b9c68a088546
parent8942afa981d8569040f148bcde5ee734e5172934
parent21e8b48d132b564ac4162e8608612c63b1ce439a
Merge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt