Merge branch 'MDL-50816-29' of git://github.com/jleyva/moodle into MOODLE_29_STABLE
commita74ead42602e7384aa081878d7c1c06560158826
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:21:36 +0000 (5 18:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 16:21:36 +0000 (5 18:21 +0200)
tree3f654c46d8627f759ee3cc9f632eb411ac714497
parentb963701081ba691d1e29a0d179054319c72a9375
parentfc0103cc80e56ae2aea2d20d4d6af7f2173951d9
Merge branch 'MDL-50816-29' of git://github.com/jleyva/moodle into MOODLE_29_STABLE