Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)

Trivial merge