Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 19:48:30 +0000 (21:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 19:48:30 +0000 (21:48 +0200)
1  2 
config-dist.php
filter/tex/texdebug.php

diff --cc config-dist.php
Simple merge
Simple merge