Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 01:20:13 +0000 (09:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 01:20:13 +0000 (09:20 +0800)
commitaf17e8d9dd68e6c75b36139634b00d0eaca1d0e9
tree7cd57ee61af0ffb51e2513ac0f862fe22cdd6eb3
parentdabb53c525820f293c9358a1be4a5b741cb00851
parentb5987836fcfcc65a1bda30b49d7afe152f6a1a30
Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle