Merge branch 'WIP-MDL-36070-M23' of git://github.com/nadavkav/moodle into MOODLE_23_S...
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 00:02:07 +0000 (13:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 00:02:07 +0000 (13:02 +1300)
Conflicts:
mod/quiz/styles.css

1  2 
mod/quiz/styles.css

Simple merge