Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:47:51 +0000 (02:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 00:47:51 +0000 (02:47 +0200)

Trivial merge