Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:40:27 +0000 (12:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:40:27 +0000 (12:40 +0200)

Trivial merge