Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)

Trivial merge