Merge branch 'MDL-47646_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit7364b0fea51a1e80604ac62ae5e56101b9109c90
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:30:05 +0000 (15 14:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:30:05 +0000 (15 14:30 +0800)
treeefbe258be25daaf675e2b20893732b54e6797fe7
parentb57cfa8462a6f190cd03cdfe62dcf7d2e79cd57c
parent8c0c30dd6676fcd5536b9de74491f095d411ebb5
Merge branch 'MDL-47646_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE