Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:44:14 +0000 (11:44 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:44:14 +0000 (11:44 +0200)
commitf0ad40d13c8ccec8720483fd14c155cbe4cf040b
treec75a84d1b3b7363f6e2b85b354f2c3de99e37c3f
parent538dbf37e1beebbd02b53fabbfb24847cb18cebd
parent0549f2538faa37ab32399e30e05c2b25528d3d13
Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle