Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 00:43:30 +0000 (13:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 00:43:30 +0000 (13:43 +1300)
commit3e5f4b2ca9d663c078f1c702be989c124f1a3d8a
treeec6e13495d06970c6e77a95ee051ab75cf94ca1f
parent440d861ccb9b6d369a77db1e06a769f55f22077f
parent1ce4b63bdd7c13832bfd6b28f8c03197dad62e22
Merge branch 'wip-MDL-48366-master' of git://github.com/marinaglancy/moodle