Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)
commite9eb744f6df8363ff02d283ae19471c8c7120f39
tree18de90df46d57379049a9c0001a6614c3b57f10e
parentf0c4d4d22eb5c7d21f9474c7d6a03368fe19c1d5
parentd125cf103c1873579c84830196b803a4f1c5f82d
Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle