Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 21:15:59 +0000 (23:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 21:15:59 +0000 (23:15 +0200)
commit6c9872941e3ccd63612fdf737497abb14b16e307
treeb5f898879e27cab785ac08956f27c401b291f486
parent765d7b7fd5221b64918d4416eacf54f6fc575559
parentf26274a45cb813a3fac16b2bb30ea12bf84729f4
Merge branch 'MDL-50353-master' of git://github.com/jleyva/moodle