Merge branch 'WIP-MDL-36069-M23' of git://github.com/nadavkav/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 03:31:55 +0000 (11:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 03:31:55 +0000 (11:31 +0800)

Trivial merge