Merge branch 'MDL-36680_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 01:57:10 +0000 (09:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 01:57:10 +0000 (09:57 +0800)

Trivial merge