Merge branch 'MDL-50992-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:17:30 +0000 (11:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:17:30 +0000 (11:17 +0800)
commit3f3bf3dbbeed76c2d7e6783718a1d4638b43f2c4
tree6c447ca3fe8505f355026601cf16f77610954b56
parent583ef1966a202b42ec992c2565cb05131d354528
parent01c7ba4b82d69e2007f873be123f86ca57d242f4
Merge branch 'MDL-50992-master' of git://github.com/damyon/moodle