Merge branch 'MDL-42742-master' of git://github.com/damyon/moodle
commit0b353ee03e55eb943722e51cdd2b40ba5384e2dd
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:19:15 +0000 (7 11:19 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 03:19:15 +0000 (7 11:19 +0800)
tree9372d9329108217c1eec760fc91dad158e6937f7
parentef14a8ffb4fdd7b1f96f3a3bfc6d6671b42b8601
parent3583b22717f585607671e88dc77e9d3bd76bb323
Merge branch 'MDL-42742-master' of git://github.com/damyon/moodle