Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:23:16 +0000 (12:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:23:16 +0000 (12:23 +0800)
commit58e6ac1e9a8d2840b9a6298d9d557aa31bf947f1
tree4c94ef2c50443e59747cc4796695bebb27442d33
parente820d50791ddced82f0d7e001bba32589cb3df71
parent48e5db7428dfaaca81e326688b29fdc02dbf1566
Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css