Merge branch 'MDL-38498-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit5cc84acabed6d4825bf7864e027ace575c4324b7
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 08:12:34 +0000 (20 16:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 08:12:34 +0000 (20 16:12 +0800)
tree73b818a6f73c704ef2dc2036bcf28d47fba239ea
parent543b5feae07a321a8b7f75122372182bc099f869
parentcdd041e631a1813cb92b6d861f0a4c650b257263
Merge branch 'MDL-38498-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE