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

Trivial merge