Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:17:29 +0000 (08:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:17:29 +0000 (08:17 +0800)
commitac28aad3519dbc5f73f1fcdd7f3384d008777f77
treed5ba789be33ea13f149d8ca397f4e71a88922ce1
parent0cb0cd30f57c8b72dcac1d60b4be2bb5c2d736c1
parentc9f2d347f3f327b3322d0dfcc904998dd7b15b2c
Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle