Merge branch 'MDL-48970' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 14:11:47 +0000 (16:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 14:11:47 +0000 (16:11 +0200)
commitaa29bb3ba0f0ab6dac15cdcb09f40d9b3809497c
tree01c467f5c5d06444323b3c6b780477bd496b2c1f
parentf72a201884e57d8a7fd84aaff02cf99619f227f4
parentfef51794a08c2a3fff0ae04687be706e5c64d8cc
Merge branch 'MDL-48970' of https://github.com/andrewhancox/moodle