Merge branch 'wip-mdl-34190' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:53:49 +0000 (16:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:53:49 +0000 (16:53 +0800)

Trivial merge