Merge branch 'MDL-29817' of https://github.com/rushi963/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jan 2016 23:51:06 +0000 (00:51 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:24 +0000 (10:15 +0800)

Trivial merge