Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 17:57:38 +0000 (19:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 17:57:38 +0000 (19:57 +0200)

Trivial merge