Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 16:06:22 +0000 (17:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 16:06:22 +0000 (17:06 +0100)

Trivial merge