Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)

Trivial merge