Merge branch 'w04_MDL-31238_m23_php54' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 22:54:44 +0000 (23:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 22:54:44 +0000 (23:54 +0100)
1  2 
lib/moodlelib.php
lib/simpletest/testfilterconfig.php
message/lib.php

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