Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 03:26:06 +0000 (15:26 +1200)
commitd4d97627d2ffce96e86abc06e2d11d48dd07232d
tree3dd8ae32b99afa0e584d184442ff25060590cc42
parent26c9c586c9a33520e136d4c09da9011ccad7f6ed
parent6a0189eb3f78fb760e21c110b36bba8128fb6700
Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle