Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:58:41 +0000 (21:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:58:41 +0000 (21:58 +0800)
commit283b1d32bd7fe08594dd2abe2efa71bffadd404c
tree7c8bb6e772eb1c38e8d014f3bb320f41d880ebe3
parent677e6345c2e969f78e2d4f9c15365e81d2be8097
parentb7c7f0d10e7dc041ad85654e593e6c9af4041c0d
Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle