Merge branch 'MDL-48914' of git://github.com/rtcn2/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:44:05 +0000 (17:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:44:05 +0000 (17:44 +0800)

Trivial merge