Merge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle
commit25de6f3ec05a215bfc734c22f2803240b3b50a77
authorDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 03:54:53 +0000 (15 11:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 03:54:53 +0000 (15 11:54 +0800)
treed4b1c11574e2882833f738a98b0c4db8f1a78511
parent176cf1ca911b016d7fb35c10c3b703ada4c9ab7e
parentcfe12ff0334b7e5eadb009f99e60f9e5373e6183
Merge branch 'MDL-49545-master' of git://github.com/ryanwyllie/moodle