Merge branch 'MDL-52523' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)
commit58920c8e5362f246fa4a920295fcedf06da30d45
tree9bfd668fc2bb6dfa829895f6f85c8c7d6c6f0092
parentea3ebbf20e10bc80598a59aee7143c03d40bc3db
parent8eef9244bed13019aab9712213ea9bfa36a047f5
Merge branch 'MDL-52523' of git://github.com/timhunt/moodle