Merge branch 'MDL-40320-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 02:30:56 +0000 (12:30 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 02:30:56 +0000 (12:30 +1000)
1  2 
course/renderer.php

Simple merge