Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:26:54 +0000 (02:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:26:54 +0000 (02:26 +0200)

Trivial merge