Merge branch 'MDL-40916_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 02:47:20 +0000 (10:47 +0800)
1  2 
mod/imscp/index.php
mod/imscp/view.php

Simple merge
Simple merge