Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:32:34 +0000 (17:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:32:34 +0000 (17:32 +0800)
commit2f3ebc9bdb17a04222a79a0136f5c8a06d9fd569
tree642d65043d010b429fd66f6d0102c7098382a984
parent355570f9e76c16462f32b56cad87039a1c34ea40
parentea3aa9f9a06fe22d44ce3cb19f4083006b93c20c
Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle