Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 15:51:44 +0000 (16:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 15:51:44 +0000 (16:51 +0100)

Trivial merge