Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:33:15 +0000 (18:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:33:15 +0000 (18:33 +0100)
1  2 
lib/moodlelib.php
lib/setup.php

Simple merge
diff --cc lib/setup.php
Simple merge