Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 8 Jun 2012 07:51:41 +0000 (15:51 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 8 Jun 2012 07:51:41 +0000 (15:51 +0800)

Trivial merge