Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 03:53:30 +0000 (11:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 03:53:30 +0000 (11:53 +0800)
commit3357822d0ccc8be0bb45fc9814fca16d513917ba
tree4396f9aa00743185470bbcb353fcdc285abc66e9
parent1829dedd0ed91904f303501e24e387cfc63a7867
parent052141abc7aee3f084f9445ee0453970404fe6e6
Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle