Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:23:29 +0000 (08:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:23:29 +0000 (08:23 +0800)
commitede96605ac49ffd5b5d1ef8ebac08fea9921532b
tree21eb3590a102f53308f65b27274a061938c50cf9
parent20c50b0d5c42d01635c17673f438ce51984c6c11
parent27479b5cc9f0469c1c588155d547da4ce6a72508
Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle