Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 Dec 2015 04:51:48 +0000 (12:51 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:52:24 +0000 (18:52 +0100)
commitf2304bfb81b2f3c22bf7704d72a0857fec66981c
tree3684440bc95656e09828b1e79662248b0e73b478
parent53907dbee56dca037fe42c589d5688418af528e9
parent5aeba19926fa4ed15b5a458ea851102b1001dab1
Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle