Merge branch 'MDL-31351_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 00:47:10 +0000 (01:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 00:47:10 +0000 (01:47 +0100)

Trivial merge