Merge branch 'MDL-36015_m1' of git://git.catalyst.net.nz/moodle-r2
commit8586777168c413edadadb5cb2fa87f6f0a9d24aa
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:18:45 +0000 (30 10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 02:18:45 +0000 (30 10:18 +0800)
tree67bd0e5d0e3dcea341f191aea3f0c8b64066b60a
parent752a3f14befed5754efd54b3914bef358498618d
parentf335bebd838bb8b99737618d1a8d59416bc29eb7
Merge branch 'MDL-36015_m1' of git://git.catalyst.net.nz/moodle-r2