Merge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 13 Mar 2015 02:15:29 +0000 (10:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 Mar 2015 02:15:29 +0000 (10:15 +0800)
commit774b0af2a01364a036f2189b1d6ff241278d607d
tree6fafa7ca47026943c22221729418a395ad35d2cc
parentc0976b0229c4f3123d94548577cf3dd547c60e34
parentf4042b73f2729e210cdb4ab92b139f1da02a9a93
Merge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle