Merge branch 'WIP-MDL-36033-M23' of git://github.com/nadavkav/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:59:57 +0000 (14:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 06:59:57 +0000 (14:59 +0800)

Trivial merge