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

Trivial merge