Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 02:45:29 +0000 (10:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 02:45:29 +0000 (10:45 +0800)
commit01fdb048cf4312349e8fb200be8329b63a393b4a
tree27391b854264d410ddd30b42ae7c2534a3c99fdb
parent641379401891fd3eb90087fe0b95d850721fc02d
parent4829645724d0aa60910486ef7719f8fd298ac1f0
Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle