Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:43:38 +0000 (00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:43:38 +0000 (00:43 +0100)

Trivial merge