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

Trivial merge