Merge branch 'wip-MDL-38303-m24' of git://github.com/samhemelryk/moodle into MOODLE_2...
commitea8393591f6e9730d31a184210b2ffc161db5636
authorDamyon Wiese <damyon@moodle.com>
Thu, 14 Mar 2013 07:32:34 +0000 (14 15:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 14 Mar 2013 07:32:34 +0000 (14 15:32 +0800)
tree6b6fc1bcc8dee1911c93b2e07490dc81ff3e770a
parentecbf8aee6eaec93c777343863357948dad797841
parentd55276ee51fb09204022ef284ee30f683271814d
Merge branch 'wip-MDL-38303-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE