Merge branch 'MDL-37539-master' of github.com:damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 01:10:47 +0000 (02:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 01:11:27 +0000 (02:11 +0100)

Trivial merge