Merge branch 'wip-mdl-32218-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:35:37 +0000 (14:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:35:37 +0000 (14:35 +0800)

Trivial merge