Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 23:48:47 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 23:48:47 +0000 (00:48 +0100)

Trivial merge