Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)

Trivial merge