Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:56:00 +0000 (10:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 22:56:00 +0000 (10:56 +1200)
commitb89fbc461555d1d7ec58249681e6280eac7baa72
tree764aa22d19218aa0ceedee241d3341ea79bb6dc6
parentead9cce340cb90536b21f5e0388c67400ea602f7
parent048422dd8e71b91ae31ac4856d31484e4babbe5b
Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/base/style/filemanager.css
theme/bootstrapbase/less/moodle/filemanager.less
theme/bootstrapbase/style/moodle.css