Merge branch 'MDL-36525-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 06:49:44 +0000 (14:49 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 06:49:44 +0000 (14:49 +0800)

Trivial merge