Merge branch 'MDL-34467-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:14:27 +0000 (15:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 07:14:27 +0000 (15:14 +0800)

Trivial merge