Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 09:41:45 +0000 (11:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 09:41:45 +0000 (11:41 +0200)

Trivial merge