Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)

Trivial merge