Merge branch 'MDL-33362-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 08:01:09 +0000 (16:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 08:01:09 +0000 (16:01 +0800)

Trivial merge