Merge branch 'MDL-55518-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:43:52 +0000 (01:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:43:52 +0000 (01:43 +0200)
commitc74bbbb6d57700211c0d23eb307d48a82aa3ed57
treee572700d5a99e1f7f1d264a4bf12545192f43f83
parent7b7dbac4e8520b75bb223aa74e8ef5820dbba314
parent8ad2afd3166ac6aa977d5ae33c101a28cfcf1006
Merge branch 'MDL-55518-master' of git://github.com/andrewnicols/moodle