Merge branch 'MDL-50115-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit3bfe6aa8775a65cf2db40e9b1dd9546f4652549f
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:11:37 +0000 (8 14:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:11:37 +0000 (8 14:11 +0800)
tree5bd5a7a4fcd3964a54bdd936d895997ef5206284
parent5d09708b2551feb1723a821d1be09077784292be
parentc0abaa9fdf93a260366f6911519e3952370b260e
Merge branch 'MDL-50115-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE