Merge branch 'MDL-36667-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:42:31 +0000 (09:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 01:42:31 +0000 (09:42 +0800)

Trivial merge