Merge branch 'MDL-55741_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commit5997c8775df96b1b6732b77a4e05e28e27f7bb81
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:54 +0000 (29 14:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:54 +0000 (29 14:08 +0200)
treef33151415eb445ff1744812f49cb63ff50bb1e4f
parent12ed0259b691662b02d4e6643fa4e0965dad8d71
parentaffe326f23cc60e76d6064bc476349554ecf1312
Merge branch 'MDL-55741_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE