Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)
commite5d5bfdc4f421ea8c86d6786e56b5ad839317967
tree1b17024366537676f802e4c301bac6992b442095
parent7b2945b847aba5938ffb814a373da3031ee76361
parentce3cfc8f92e4bcda184621f0dd4f3a34f4285e14
Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle