Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)
commit9834bce7004ca403d817617fd8e2ceeea1b2444a
tree43ed1a146148f30796c348ccb6d25dd8aa31168c
parent8d4da7c01031b590747d845965c5c9a27c1b9089
parent1b28d1a70edac3048cd5696f1f674d0c6838d195
Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle