Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 19:50:23 +0000 (08:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 19:50:23 +0000 (08:50 +1300)
commit179ddd105ba83cbbfa51c641c7eeef1b367cc549
tree16baeececa5a83ed211a63f3bf0077cb3c3ca79b
parent705c5e0aeda4d5ceff20561d135904ad8d71d826
parent6b21643236c103868357c9d1f70173fdb53066f9
Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/tablelib.php
theme/bootstrapbase/style/moodle.css