Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:40:50 +0000 (01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:40:50 +0000 (01:40 +0200)
commit4922a1d46a3c1ba18b19bc00dd195d178b666a48
tree55a09ee070f79c49d78b7e99668cd437eff84201
parentda483a72c8d8cddef24fdecd4e7c9225c676382b
parent46629116cc9bdc39c1046dbfd4ef1477bf814511
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle