Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jul 2014 07:04:55 +0000 (09:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jul 2014 07:04:55 +0000 (09:04 +0200)

Trivial merge