Merge branch 'MDL-34520-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:56:03 +0000 (09:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:56:03 +0000 (09:56 +0800)

Trivial merge