Merge branch 'MDL-49324-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 06:55:51 +0000 (07:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 06:55:51 +0000 (07:55 +0100)
commit6ab07f97bfb0f6f5b9bec4b4cebd238652f16f95
tree08e975aaa1a8186f7c7b8e98bb005e0246123bc2
parent21efa3c65cb03d9b46251aa105b2080b6369681b
parent0c31d92452adc00d1c0ff90c59cb87b9703a0495
Merge branch 'MDL-49324-master' of git://github.com/andrewnicols/moodle