Merge branch 'MDL-35379-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit3b9ed3037f85b3dfc57b310a0de88a74d83876d0
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:42:06 +0000 (24 15:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Sep 2012 03:42:06 +0000 (24 15:42 +1200)
treeb25666a053eeeab7f98349235b84ab91909ce78c
parentc5bc14690f36ee88872d442972197e8dd224dc9d
parent28f6aa743fe0ce97e611425ae45b75ab8a056408
Merge branch 'MDL-35379-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE