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)
commit91d5e08aa3b4027577b12b31448743caeac6f61c
treebab72681fc1dd964cc30c861193bee4f6ad0b971
parenta91350609eeefd05ea29a9c64cfc371e909a668d
parentdf3efbfb2cec6dbe7ab278f5267459a1b5eae752
Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle
lang/en/error.php