Merge branch 'MDL-29909-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 1 Aug 2012 00:35:19 +0000 (12:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 1 Aug 2012 00:35:19 +0000 (12:35 +1200)
commitdf0d0fdee728973d02ec92e227516ac6a5f2d8b9
tree59319a7b17c356a84b28512b324b6c87e695163c
parent66146ffcf79ad1a6b23b814bff00f4216e815bb3
parentc2ab23894b2365640bdc54a6defee178a876d3c1
Merge branch 'MDL-29909-master' of https://github.com/mackensen/moodle