Merge branch 'MDL-32605-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jul 2012 07:45:59 +0000 (15:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jul 2012 07:45:59 +0000 (15:45 +0800)

Trivial merge