Merge branch 'wip-MDL-32184-s23' of http://github.com/phalacee/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 07:36:04 +0000 (15:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 07:36:04 +0000 (15:36 +0800)

Trivial merge