Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:16:27 +0000 (13:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:16:27 +0000 (13:16 +0200)
commit7aad43e13f8a7992d3d78378af19d97f524f9ced
tree6c8f264e543c871a1ae62f8d6d0013aca18cd72b
parent64c1e707a98fbf1696ab014f5369b6d17213b885
parenta066cfc843fba21b54255915064c8060b4861604
Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle