Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:28:53 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:28:53 +0000 (01:28 +0100)
1  2 
lang/en/error.php

Simple merge