Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 05:39:01 +0000 (13:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 05:39:01 +0000 (13:39 +0800)
Conflicts:
theme/bootstrapbase/style/moodle.css

1  2 
mod/book/view.php

Simple merge