Merge branch 'MDL-28364' of git://github.com/jonof/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 02:55:53 +0000 (03:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 02:55:53 +0000 (03:55 +0100)

Trivial merge