Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)

Trivial merge