Merge branch 'wip-mdl-35883-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:16:58 +0000 (12:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:16:58 +0000 (12:16 +0800)

Trivial merge