Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 11:50:47 +0000 (13:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 11:50:47 +0000 (13:50 +0200)
commit536c4e920a167b19e2c5d869d4d2d1fb4746ab31
treee070592bb7f155a9c2b9e6992ac7a419b919d7b5
parentc9f85a10148841d9ae5d10313de0ec2b5b60d1b7
parentb4baee42e20f753c450f858ac558476cf9a54b19
Merge branch 'MDL-54643-master' of git://github.com/jleyva/moodle