Merge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:37:24 +0000 (11:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:37:24 +0000 (11:37 +1300)
commitc5057d3ecce200076241e71909468a27466188b3
tree2f8740828e4ac0e29e00a4c3c7060976d860012a
parent0ebe4f74aa33849943689b3d690fe32901321f4a
parenta90674fc9ccd7a1888e8c6f0dfb0cd6bf5547761
Merge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle