Merge branch 'MDL-39342_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 07:36:30 +0000 (15:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 07:36:30 +0000 (15:36 +0800)
commit5402f6462393e8708dd5f5ce9a0e6df8a4b5560e
treee68bfffccfa3d4b6671e5341f343d62afde04ad3
parent70f7ea93271a092aff50503ad74666e5f008afbc
parentd9c557099c3a0618e24336fd28863adceb575363
Merge branch 'MDL-39342_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE