Merge branch 'MDL-55604' of https://github.com/mr-russ/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 24 Aug 2016 01:35:39 +0000 (09:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 24 Aug 2016 01:35:39 +0000 (09:35 +0800)
commit086ef7d4182a5d57c822d9d4eb253430795d380c
tree3584b02ebfb0460e7bb2dea6b5864f450b58d065
parent30daa6147574ee99f7da81b5c7992f79bbe12c61
parent7ff43e1acf1fd324f807b5db6b4dced1027921dd
Merge branch 'MDL-55604' of https://github.com/mr-russ/moodle