Merge branch 'MDL-57419-master-2' of https://github.com/xow/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 06:33:25 +0000 (07:33 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 06:33:25 +0000 (07:33 +0100)
commit28b1cc19e7cd8326cf6e168a680b340d2490cbb5
treeb9da802ecbebe534f434dffb60099ff209cb583f
parent2154c9824d6231ad084b6e65e6cd7b15f92a663d
parente09066d0ebbe0f27638cb28f47460980ba460505
Merge branch 'MDL-57419-master-2' of https://github.com/xow/moodle