Merge branch 'MDL-49998' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)
commit84d83fe7e1121638562298a42686f798196a5221
treeb043ce0927b4ff9430b2a9f4d30339efc3381319
parent600596fd6a511497aea7a95d2b276cb78c874073
parent46686eafebb74ddc39deaaccb9978fdf532ca04b
Merge branch 'MDL-49998' of git://github.com/stronk7/moodle