Merge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jun 2014 00:07:34 +0000 (02:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jun 2014 00:07:34 +0000 (02:07 +0200)
commit0518b6a26ac0f088c4b488685cd52961c95bf287
treec47b6cda897603071d2b5fea460f028efd42c13c
parenteaa504cd678e08739349f3e16e6b577905296880
parent29d4dfec3403e91f52c8a7f11ae7ae33119d01a9
Merge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle