Merge branch 'MDL-35964' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 05:48:44 +0000 (13:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 05:48:44 +0000 (13:48 +0800)
1  2 
lang/en/admin.php
lib/blocklib.php

Simple merge
Simple merge