Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)
commitd6db7a1d9a3c1b14e7ff8ebf98b2a2a2d3f8419c
treebce8a365dce13125b9094fc80af94b6e677b662b
parent988a031a610bab3c271e9ea4a9e1f4ce038c4550
parent3f56d612ec760bb072dbf027bf7a519156f07a65
Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle