Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 16:23:41 +0000 (16:23 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:48 +0000 (11:37 +0000)
commitf9fae517043dc2c46bfef58d2b67fe345f4d23ce
treee4b633802348683e7a7b0f361ceffe19e291b5bc
parent7b58b245bf6b96ee1572f13b9d98bd1b9e8be77e
parentc35d736a443d6bc89a7c42b7f01cd73ffb75960e
Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle

Conflicts:
version.php
lang/en/admin.php
version.php