Merge branch 'MDL-35336' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:23:51 +0000 (12:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 04:23:51 +0000 (12:23 +0800)

Trivial merge