Merge branch 'MDL-29129-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 21:58:27 +0000 (23:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 21:58:27 +0000 (23:58 +0200)

Trivial merge