Merge branch 'MDL-54117-master' of https://github.com/barbararamiro/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:50:13 +0000 (12:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:50:13 +0000 (12:50 +0800)

Trivial merge