Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 07:54:25 +0000 (15:54 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:51:42 +0000 (18:51 +0100)
commit200ab5266ab2cb1a266c4fd507de9906c619cbf9
tree4e70847708dd4ad6ae8386c98746bdb119336b4d
parent6e8e992d37d9d5286466c547107d184e849aa00b
parentc917b53a8df4d3e9a98ff0803b636e28548ab77e
Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle

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