Merge branch 'MDL-34795' of git://github.com/srynot4sale/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:04:47 +0000 (02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:04:47 +0000 (02:04 +0200)

Trivial merge