Merge branch 'MDL-46654-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 07:30:54 +0000 (15:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 07:30:54 +0000 (15:30 +0800)
commit86d6ff2dc825379a90f10a610096a5081b0729f0
tree6edf35d7763f0263f8f51eb1640b12ee81e8703a
parent0969f0da5ba9c1078df845382eb74caf3aa0f965
parent8381ac52cd6f609ad00639d263c2ad108d9f4dde
Merge branch 'MDL-46654-master' of git://github.com/andrewnicols/moodle