Merge branch 'MDL-34535-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:06:56 +0000 (12:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:06:56 +0000 (12:06 +0800)

Trivial merge