Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle

author Dan Poltawski <dan@moodle.com>

Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)

committer Dan Poltawski <dan@moodle.com>

Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
author Dan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
committer Dan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
diff --cc lib/form/filemanager.js
Simple merge
diff --cc repository/boxnet/lib.php
Simple merge
diff --cc repository/upload/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)
		1	2
lib/form/filemanager.js	patch \|	diff1 \|	diff2 \|	blob \| history
repository/boxnet/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
repository/upload/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history