Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
commita68bc19fa6031a6a697f508baa21d4d04275f272
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 23:04:51 +0000 (7 12:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 23:04:51 +0000 (7 12:04 +1300)
tree370ebe69033fb4d43ec4f2926fd104877852a59d
parentc1fcc89f714f6549bc2aeb56b2897d90d9f73576
parent7f7e18c3a21b78bfaeec4f1a8f5d3129affce08e
Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE