Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 16:54:49 +0000 (18:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 16:54:49 +0000 (18:54 +0200)
commit648bbbbbd051cc107798a100e7771852621cfd02
treecc8eeac827d15dad11671afb6ef1965bf0639568
parente0519d032d46d4c50d6d74aed07debac5e161793
parentb4fe4e25b296cae0e2a95c8ca5aa8ebb2d59dbd5
Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle