Merge branch 'MDL-53115-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 01:32:57 +0000 (03:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 01:32:57 +0000 (03:32 +0200)
commite44b55f5d0c5cb6e39b1f973531dbe27d8050504
tree53a106684b99622d278d1e804176caa8692dcbc8
parent9e6c63a7e1a791127b2d76baf671f59094bc3112
parent82bb931a31a3fe57d0c82425384d62256f42c0e9
Merge branch 'MDL-53115-master' of git://github.com/andrewnicols/moodle