Merge branch 'MDL-36944-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:41:02 +0000 (13:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:41:02 +0000 (13:41 +0800)

Trivial merge