Merge branch 'MDL-39068_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
commitf7f4494fb7863d9595dfc448bb5d46cc70a061c1
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 06:24:26 +0000 (15 14:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 06:24:26 +0000 (15 14:24 +0800)
tree6081a09041d9c3579fcdd68fa2af017efe75f633
parentc7ed9140770c5c128eaad5850796f379e51208d3
parentd84477702d029c37a9b230f0d667b1b24cfd97e9
Merge branch 'MDL-39068_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE