Merge branch 'MDL-43570' of https://github.com/KristerV/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)
commit9d39960028f1c8dfda1483f7641140fd0ada883e
tree8a143c243e194fa451dac6b49b49f4baa32f187f
parentcb3cc79c827bbaa335d5836899395377d50ef337
parentecdb94d3e0b86f4272859cefabafb5201981754f
Merge branch 'MDL-43570' of https://github.com/KristerV/moodle

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