Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 05:57:47 +0000 (13:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 05:57:47 +0000 (13:57 +0800)

Trivial merge