Merge branch 'MDL-10115-27' of git://github.com/xow/moodle into MOODLE_27_STABLE
commit9dc96087950694e358fa4510c7d7c6b24d7c8fea
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:03:53 +0000 (24 16:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:03:53 +0000 (24 16:03 +0800)
tree2b799d8a91a00263fc825deee5a7903de27cd34d
parent80bb90c3cab7e61b4fd085c40f6c9953972e8a57
parente08d29046988d6c1af6b0408cca6860aa9753f8b
Merge branch 'MDL-10115-27' of git://github.com/xow/moodle into MOODLE_27_STABLE