Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
diff --cc lib/filelib.php
Simple merge
diff --cc lib/form/filemanager.js
Simple merge
diff --cc theme/base/style/filemanager.css
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)
		1	2
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/form/filemanager.js	patch \|	diff1 \|	diff2 \|	blob \| history
theme/base/style/filemanager.css	patch \|	diff1 \|	diff2 \|	blob \| history