Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:28:56 +0000 (08:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:28:56 +0000 (08:28 +1300)
commit6958c718cc9ba90172d366d68f591cd9b6c799ad
treed4aa4eedb3bda7df290adb4ffdd7c480b856d540
parent4f31798dfcde638578fced53e8553676af261568
parent1ec8b1c7ead8f449eb445e6a975eb6159c175faa
Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle