Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:22 +0000 (11:48 +0200)
commitfc91acc81384b45e7e870c92f96a29e9faa02e11
tree4a6981fc66f8283078e002d4592b9cb2061745b6
parent614820522f4dc88b235047d83c1ff5781c7a98c4
parent2ccbcf01698f0c46cf6deaaa12a3a38aa630b096
Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle