Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)
commitae9ed08f538fc7b6634639d34e9e0e372be2d194
tree4d286ebf756bf46a614e127c9974804cb560a578
parent2572356895c8d935ce77ad4e634d932bc3ace463
parent551e64ccb97ebc205e7eac4f4af428faec27e112
Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle