Merge branch 'wip-MDL-51062-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 06:23:42 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 06:23:42 +0000 (14:23 +0800)
commitf5d23fc162be127f7ec5ddb8f7b08e6eadccc17d
tree9fd223a626c86e1ca908b64a38a485b689cd3398
parent3f3bf3dbbeed76c2d7e6783718a1d4638b43f2c4
parent7f0c7f01c0da3c21f1a52890ab9ad6a1b3b13cce
Merge branch 'wip-MDL-51062-master' of git://github.com/marinaglancy/moodle