Merge branch 'MDL-53660-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit484a08cc15cf73484a2dfde1d5cf090f5375ff18
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:20:10 +0000 (20 01:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:20:10 +0000 (20 01:20 +0200)
tree524d62876aefe804468a96c3daeaf3c4d90d9a01
parenta57c6830eaec04bc4e100a6d9a629acd6e73a4ce
parent354fd0dba752f448e009eac69c9d448e242fdf2d
Merge branch 'MDL-53660-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE