Merge branch 'MDL-51514_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 07:59:43 +0000 (15:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 07:59:43 +0000 (15:59 +0800)
commitcc69a29b4bd78a6f84780c6120196973ee783ec7
tree25c97b2db4d0b7790fb6f74b08bf25b711c822aa
parentfe73503248efb710c4b1214d8bc72c15361f5376
parent84ab39cf77d10bfe5b84678ca4874e43dd55342b
Merge branch 'MDL-51514_master' of git://github.com/markn86/moodle