Merge branch 'MDL-29598_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:23:26 +0000 (23:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 21:23:26 +0000 (23:23 +0200)

Trivial merge