Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle
commitedd94e24b0ab7eafaf61341aae9358f4a7388a32
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2015 23:04:23 +0000 (19 01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:37 +0000 (19 18:30 +0200)
tree51756c2964474040be3318d1eca550d5d600be0a
parent5d60665bef0d9485f908f4c1dc6c179351267444
parentcc7a4f4b395e2c9f331aa10b1068ba5c3c41d5f0
Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle