Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:13:07 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:13:07 +0000 (11:13 +0100)
1  2 
course/edit_form.php
version.php

Simple merge
diff --cc version.php
Simple merge