Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 21:45:40 +0000 (23:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 21:45:40 +0000 (23:45 +0200)

Trivial merge