Merge branch 'MDL-49973-28' of git://github.com/cameron1729/moodle into MOODLE_28_STABLE
commit3bf8439e3a4dc7795fc542916db6ef17c162e2f9
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:44:46 +0000 (22 09:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 08:44:46 +0000 (22 09:44 +0100)
treea452bef8ed528964ba049b842d5e5adc648ff19a
parentc6a6ce7914b638cbafe4ddd232586e2d5b6cc5fc
parente13126f85a0e7481b7d4f86923650ed19fb43562
Merge branch 'MDL-49973-28' of git://github.com/cameron1729/moodle into MOODLE_28_STABLE