Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Jan 2016 04:01:31 +0000 (12:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:26 +0000 (10:15 +0800)
commitca29dd4e84dfef1bc33322b2d9dfde1cbeb9b422
tree9ed6373f31e1d02c00555c3079022695b079eb87
parent17cd73b684d6247fec733e84daf5f4d1a5135cde
parent90902953a89ca9542f3a06c918e88fc9a2613c72
Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle