Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 00:53:25 +0000 (08:53 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 00:53:25 +0000 (08:53 +0800)
commitd22147667d0a555850d8d2afbb9952a3315a01f2
tree46dc149d96b195ced40e22b68b05eaddaa7a31fc
parent9fff2532931aa30f7dbaf1c097d3dad12176b253
parentf487a8f8259f6520173b3dfd2067410ba79822e6
Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle

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