Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:13:33 +0000 (15:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:13:33 +0000 (15:13 +1300)
commit13ff5c990c23e5e51170f27abb2bb487ebb75be2
tree61b4a2c67d6bbaddc9514eb5d081d5ed52167fe5
parent3e5f4b2ca9d663c078f1c702be989c124f1a3d8a
parentc6fb5a7e1e74a6fa0c3412c3a550566da3720d38
Merge branch 'wip-MDL-31851-master' of git://github.com/marinaglancy/moodle