Merge branch 'MDL-50613-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 04:10:40 +0000 (12:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 04:10:40 +0000 (12:10 +0800)
commit117fb5a21e0f88373b7dcae6072e2e78eb9e414a
tree8109aad13fb34b8a7f1426a84f40e28912db1930
parent35d3e8b00b3e1d11249b47a8626238b9a762a7be
parentfca9e67c25e77694eaff02c10cae4326173ac3d1
Merge branch 'MDL-50613-master' of git://github.com/jleyva/moodle