Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)

Trivial merge