Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle
commit765d7b7fd5221b64918d4416eacf54f6fc575559
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 20:11:55 +0000 (16 22:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 20:11:55 +0000 (16 22:11 +0200)
treec10c84c3cecc8ce898a888fb012eecefd025e4fe
parent822e9df70d1a0f3e2d31f2fecd046c85f1a231e5
parent6b4ceb24cfc6700daa1cea967d378171d3614b13
Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle