Merge branch 'MDL-27710' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 03:28:21 +0000 (11:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Mar 2012 03:28:21 +0000 (11:28 +0800)

Trivial merge