Merge branch 'MDL-41321_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 06:06:54 +0000 (14:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Aug 2013 06:06:54 +0000 (14:06 +0800)
commiteb1526e059d50345710cc9b487cb40f479c0e13e
tree73ec83f882823648b867ebc05bfacd70e4f15a34
parent9a6c6d1cfd9e5d01cc9eb859fa963385791b260b
parentcef25b2ac22151a72b125e79b8a5f3a064fedc23
Merge branch 'MDL-41321_master' of git://github.com/lazydaisy/moodle

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