Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:19:26 +0000 (10:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:19:26 +0000 (10:19 +0800)
commitc64d22325ebeff0d5f17cf4281cbc391742f2a2d
treedc699d3915e89858a52f7eb8a3799c366ad6e58c
parent33abc6e17348b7cb4742b5f0e169891465e996b6
parent84b3cbab33b27774018c6e2593ae75179537f4fe
Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE