Merge branch 'wip-MDL-42739_M26' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 7 Nov 2013 03:29:57 +0000 (11:29 +0800)
committerSam Hemelryk <sam@moodle.com>
Thu, 7 Nov 2013 03:29:57 +0000 (11:29 +0800)
commit16a14e4a5f2b19f725dbfdc9d0da81033526bae1
tree01167de31a057ff3e1012c7096c62d2d1ea608ca
parent57d14266a8287d30730116e0407144aeaa6ca087
parent4731319e249cfa21d4f84b35a1748af912ee30be
Merge branch 'wip-MDL-42739_M26' of git://github.com/lazydaisy/moodle