Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:44:53 +0000 (09:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 01:44:53 +0000 (09:44 +0800)
commit068f1fce33ad1c309fd27665ebd69a05a76aaf96
tree4980fa7923945837f164a7b4d6c96ca515508f0a
parent5e8a03b4293ca2b16925c95476ad7708a737d0c4
parent89a73b08157865b381a6f95198657c69327e00dd
Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle