Merge branch 'MDL-45772-29-4' of git://github.com/xow/moodle into MOODLE_29_STABLE
commitdb526aa03a4a4843ee191be77bbc909f679db2ce
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:01:33 +0000 (4 10:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:01:33 +0000 (4 10:01 +0800)
tree7e2e0ba3c553943b7305847c9a241e7a5c7a388a
parent9d4c7b6573123857cea5191097fc0c8e7a24bec7
parent56b63c4151c30cd950afe15a78228fb739b24798
Merge branch 'MDL-45772-29-4' of git://github.com/xow/moodle into MOODLE_29_STABLE