Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:11:51 +0000 (02:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:11:51 +0000 (02:11 +0200)
commita18daae62b173f9f7b60d782e2eb40362f91efcf
treeb9dabb5e945bf020f3657ba7d49b6868f78d4959
parent109d6fe29014c4db7e647d9e2d761ad6d0841e67
parent6e09cf98fa824a17dffef96f6efa8dd07b633e12
Merge branch 'MDL-41342_master' of git://github.com/dmonllao/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
admin/index.php
lang/en/admin.php
theme/bootstrapbase/style/moodle.css