Merge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jul 2014 07:18:03 +0000 (09:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jul 2014 07:18:03 +0000 (09:18 +0200)

Trivial merge