Merge branch 'wip-mdl-31734-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 03:57:21 +0000 (11:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 03:57:21 +0000 (11:57 +0800)

Trivial merge