Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:33:23 +0000 (08:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:33:23 +0000 (08:33 +0800)
commit42d81ef740d998e945f30ad64d1c1b9237b1d752
tree0ccf845f4f2696b6a560cb2b338b0fb4acefd32a
parent43e15173ddcda8959da670216af7a7fd4005755f
parentc803fa68550499aeb2ecd912ff150036c451d4c3
Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle

Conflicts:
version.php
config-dist.php
lang/en/admin.php
lib/db/upgrade.php
version.php