Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)
commit922d32371a2e5677adb49c7b15e1245d010d84a5
tree29813d2af91296b6003aa5aeb9b3671c1f96772a
parent22f098cd232801cb2631bc6e3d2152e32170ff3b
parent5bc886259b2fe5a24264c274cfb3a96098ffb56c
Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle