Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 01:02:41 +0000 (09:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 01:02:41 +0000 (09:02 +0800)
commit7a662077f1a3c065ddfab149e8dc0bb91909e0e0
tree848f07b06b29c659624b65a9964781c8b8d4cf21
parent0099960560f2fcf5f9ebec1d7e353dd8f8e18bbc
parentabedeb8c70ef35ec59a961a20f6610f7850f6f2b
Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle