Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)

Trivial merge