Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)
commitb191360fea8c7c0019f4d1e5f3fbd566b817b69b
tree5fdca2cae39e1dc2f02b1b61b08db15427961b15
parentef4b8bb98b79f6fe722f9a5b5aa31f0ac4ea2426
parentc96534600da9c0f9e4be2dbd55811b62f3fd5856
Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle