Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:22:22 +0000 (02:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:22:22 +0000 (02:22 +0200)

Trivial merge