Merge branch 'MDL-50171-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 23:42:47 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 23:42:47 +0000 (01:42 +0200)
commit26adb614ae9c6a9a88d88dccff1b512e5ef79d71
treefe31e49ed96e0cd46691cc41a1c73d8620d7aedf
parent06ec3e57f1aa2ed9314559642ff725edc5115c95
parent3c4d2965deb32d042345036b6405c48e5a400ce6
Merge branch 'MDL-50171-master' of git://github.com/jleyva/moodle