Merge branch 'MDL-35153-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:59:28 +0000 (01:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:59:28 +0000 (01:59 +0200)

Trivial merge