Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Jun 2013 22:01:10 +0000 (10:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Jun 2013 22:01:10 +0000 (10:01 +1200)
commit7d1d4137cac75313f7f32bcf31457edddeed6260
tree8b56f514f5b3e22783438194289010b7d3640d4a
parentf19288330522e5e9b32ce62e2a5405af3b51340a
parent74dfadea8f7fe5e6167361966b831ebcc0d6a757
Merge branch 'wip-MDL-39949-master' of git://github.com/phalacee/moodle