Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:20:28 +0000 (12:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:20:28 +0000 (12:20 +0800)
commit970d54d0766406fab39aea8f86e699dc64451ef1
tree3d576ed8783ce143e536b94b52fc8d05fcdcab63
parent1577072b7bd0708773d94ebd594353cfdcd47347
parent595b911a983a5d0cf1117b480e496248b9fc344d
Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle