Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)
commit176521e560a3e91eb2b2117a401c4465a6eb6e5e
treea475c3aacaf3028b613e10bbe4a7d668a0d790c6
parent830299fe4f15f30cb7f5858443b87aab7f2e1d3f
parent83cdecec1eabec183f8824aacb05a7c4ac04e60b
Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle