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

Simple merge
Simple merge