Merge branch 'MDL-50949-29' of git://github.com/FMCorz/moodle into MOODLE_29_STABLE
commit35728d3595fdfb3053984ed5d7d3b57452f991b2
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2015 00:14:19 +0000 (10 08:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2015 00:14:19 +0000 (10 08:14 +0800)
tree2406501ab6ae41a0b227f3ff25adb60d345cce3d
parent49fa660acaaf36cb07551d9226adbad075e1cfd6
parent4ca8a308d61886f25ad0da71829252eab82108bd
Merge branch 'MDL-50949-29' of git://github.com/FMCorz/moodle into MOODLE_29_STABLE