Merge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:43:52 +0000 (10:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 02:43:52 +0000 (10:43 +0800)

Trivial merge