Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 07:57:27 +0000 (15:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 07:57:27 +0000 (15:57 +0800)

Trivial merge