Merge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Apr 2016 02:05:17 +0000 (10:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Apr 2016 02:05:17 +0000 (10:05 +0800)
commita60b808d1c1f0f39e84b9b35bf405bcb9f1607fc
tree9ea002089ea4f1c3d8d4d69ee6e19e8ee3f5c8e8
parentcd82dcd08fdd2ad3f89299da5ce476af4beade15
parent33688fbfe690f0747792a0a1077126d940d43ce5
Merge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle