Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)
commit6579a7b7910e88f45df71da618b172ad36f1ba51
tree90af8f537d1fdf7b20b29335adb2bd1348cb928b
parent9d4ff1e5f40178adb3ca8e17f33a1601f9f6c2ed
parentd50b05e69642f099a8fe7530c48879395fbcfbb4
Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle