Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)
commit623d49dde472aec86973618b31697e9d46c13540
treec8946244a22bc35472330a53bf9d9579d1bda658
parentc5a1015338798f69fba56f80fc530c659486716a
parent44b724c374ab7ac7b88cb1126295c01d8243cbce
Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle