Merge branch 'w27_MDL-39754_m23_evn26' of https://github.com/skodak/moodle into MOODL...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jul 2013 21:14:26 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jul 2013 21:14:26 +0000 (23:14 +0200)

Trivial merge