Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 08:49:30 +0000 (10:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 08:49:30 +0000 (10:49 +0200)
1  2 
course/format/renderer.php
course/view.php

Simple merge
diff --cc course/view.php
Simple merge