Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 17:35:33 +0000 (18:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 17:35:33 +0000 (18:35 +0100)

Trivial merge