Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:00:17 +0000 (09:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:00:17 +0000 (09:00 +1300)
commitfa99332779da6fe33909bf5e8e275947be19de4f
treed040c07fd648cb2563b51f80444d70f8bda0ce43
parent862606800186061f7bf05ef02a54b90ab5e9bd64
parent13f8c064141a810eef4090c9daf59c1c5273c34e
Merge branch 'MDL-25552_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE