Merge branch 'wip-MDL-36367-s23' of git://github.com/phalacee/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Wed, 9 Jan 2013 01:50:54 +0000 (09:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Jan 2013 01:50:54 +0000 (09:50 +0800)

Trivial merge