Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle into MOODLE_27_STABLE
commit740cb942ce2681e033be44e758639daec2ef7328
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 May 2014 05:30:51 +0000 (20 13:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 May 2014 05:30:51 +0000 (20 13:30 +0800)
tree6850ce4ab69109ac1b385afa8d3d6acb1b99680e
parent3725adf852882fd698f62505ea791bccf882cae4
parentdafb79106e8d7ed74c20e6885067d82231069255
Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle into MOODLE_27_STABLE