Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 11:32:10 +0000 (19:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 11:32:10 +0000 (19:32 +0800)
commit91c547760625bd0089cfb5d4ef5374c9d53b0955
tree8a581040a601aaa65d5baea274817df3678daf2d
parent6aa4fccc749ad5198ad2306117ed726d73bcc4d0
parent7428077d4b498eca890dcde504fe3999cc94ad09
Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle

Conflicts:
blocks/course_overview/version.php
blocks/course_overview/version.php