Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)

Trivial merge