Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:34:09 +0000 (14:34 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:34:09 +0000 (14:34 +0100)
commit6c6375e438604abae05ec691acab2bc98862fce5
treea33cfc889f1a83668c40a9fef74208a04e2bfe68
parent7dc62ed3cb0b81b945568b60157ee3b30cd7b5c6
parent107e82f6a6f429f27bb2c143d17bc7188538e0e4
Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle

Conflicts:
version.php
theme/bootstrapbase/style/moodle.css
version.php