Merge branch 'MDL-33537_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 05:46:33 +0000 (13:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jul 2012 05:46:33 +0000 (13:46 +0800)
commitc5b133f790a09e42812ae4c3a83b0cc002cca912
tree5f9b198bfc1d79ae24de774101ba6d2f28a5f6a6
parentacbbf4157d6f3375ea40239e9932c0b2509322cb
parente0cf9e280a14fd5746027fc5679cd6c7922de8c4
Merge branch 'MDL-33537_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE