Merge branch 'MDL-42756_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE
commit07db3050e909f568e80559a570af880ae72ac318
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:52:45 +0000 (17 13:52 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:52:45 +0000 (17 13:52 +0000)
treec5c4810d785b7f8881b55e849d930ef3d25a46c7
parent038e41c9186966644c4c6ec878c7ceaef8015ab9
parent7ed58a20ae06ceec94fd297f62706bece749a970
Merge branch 'MDL-42756_27' of git://github.com/aolley/moodle into MOODLE_27_STABLE