Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Dec 2016 02:49:34 +0000 (10:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Dec 2016 02:49:34 +0000 (10:49 +0800)
commitddcb68b284e9cbeec83e59d7972727ebd32df3b2
treeb01793da4703d219ce2939ad1b8a508d600ba39f
parentd8326d836443d74828124c0c51447e44cb244f67
parent5f654ea2c01fd16461d53602cb98959e0e42bfb3
Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle