Merge branch 'MDL-38192-master' of git://github.com/sammarshallou/moodle
commit007b803b4a014acf4d4a75eeec0d6a45e49241f1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 22:27:57 +0000 (25 00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 22:27:57 +0000 (25 00:27 +0200)
treefbbafa738cea76baf3aa218e7bf40b06f68eefd8
parent6eef32525ecaad13daf157b5c48785cbc2060dd1
parent88372410f5c8396201daba1a2039d4818e3a8041
Merge branch 'MDL-38192-master' of git://github.com/sammarshallou/moodle
lang/en/backup.php
theme/base/style/core.css