Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 22:29:32 +0000 (11:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 22:29:32 +0000 (11:29 +1300)
commit13de6099c1fad20743d71c4219bbed2231c6cb05
treeec975126e9b19e943d52080611ebdde6b7e124f0
parent5ecfa56512ed1861e8df23a69b501eaa6f634492
parentaea2973734bc51e7306330e35fa828824aa61d8d
Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle