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)
1  2 
lang/en/moodle.php
lib/outputrenderers.php

Simple merge
Simple merge