Merge branch 'MDL-46923_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
commit063c6e23d41b9886f3efed9cafdb38299cfe2b56
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 08:48:11 +0000 (25 16:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 08:48:11 +0000 (25 16:48 +0800)
tree656a1be4b51242a8c7bc4e64382e99306bda1fb1
parent5c1f1690bb025c9322636fb21e64bfc0031e6568
parentf367cfcbefd1f9c3ae82eb87e5b3554657f7f161
Merge branch 'MDL-46923_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE