Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 21:17:13 +0000 (10:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 21:17:13 +0000 (10:17 +1300)
commit7bd5d84fd89132d306aa96ea5106b348bc6dba5b
treeaeb34c236f5b1beb6b31309eccd3fd11a0aa4e69
parentbd5797e6cce3ac6b0406c046910b64d9c777c1ce
parent0fb7a8a3dd01615dca18b67b5130d5c9a7761b33
Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle

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