Merge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 16:10:11 +0000 (17:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 16:10:11 +0000 (17:10 +0100)
commit84f7633f82b25e784a1f1ae65033a4fd21767af1
treefa3d2b499f89c8d178eed0f0931d4fbc733bb52f
parentfdca1a1dd3652273fc3edbf7a4137cf297a6ef11
parent3a723033e8f9bea7703f4f54657b837126604a12
Merge branch 'MDL-36109-master' of git://github.com/danpoltawski/moodle
lang/en/moodle.php
lib/outputrenderers.php