Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)
commitcb2ca9b9cc80ca25b70e3f5ded628de8e5ae8e34
tree65ea33989de0d4901b7d3fd8293dfcefed9da022
parentdb28260c29b695dbd9b9f3f4e0ae41ea88178a36
parentd9c767c76bb296c3b7a0da4d486972cd7dfc049e
Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle