Merge branch 'MDL-36695-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:21:03 +0000 (12:21 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:21:03 +0000 (12:21 +0800)

Trivial merge