Merge branch 'MDL-36526-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 02:06:00 +0000 (10:06 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 02:06:00 +0000 (10:06 +0800)

Trivial merge