Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)
commitca3b2c9bcc481a2f1d79c2b17b8791ad0d37c567
tree756c0ee6101331633a898c45b98cb401cac741e4
parentf3de94d340ed006e4f0c2faea566446616e02b93
parent1f1a8f03d8a9e9d1506c44500ed9a5c3026c611c
Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle