Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)
commit71668d2efcdea4d6f963d61ec797f6974de1566a
tree3da5488af002450a661610f9d5ebf1a518eaa697
parentddd0d4a56bd7f8893d5787ef6f06e0100874ac01
parente2e1c98a7f40990074583f4716b031445eba25f6
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle