Merge branch 'MDL-36839-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 06:43:50 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 06:43:50 +0000 (14:43 +0800)

Trivial merge