Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)
commit636c609b242f1e97b0545da33b35caaae7a50205
treeb33f97eea69077cfbac929adefd9006aad099143
parente8d14e464b10762c939c0a68df1393034b653626
parent25c49a85ffdcf9cf81bf84abc30acd62aeb2f681
Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle