Merge branch 'MDL-37831_filepicker_buttons' of git://github.com/davosmith/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 01:15:23 +0000 (09:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 01:15:23 +0000 (09:15 +0800)

Trivial merge