Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle
commitc783a415dca14721658110ea1a1104d0a1c20c18
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:33:42 +0000 (24 23:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:33:42 +0000 (24 23:33 +0200)
treea96ae68567e648aedda08f8dde6c240a186b5ae6
parentd0285a0d9175cef73776326c51c428187de99d10
parent1302f765a7e8bba676ddda0ad62a3f58ddbdfc21
Merge branch 'w43_MDL-42442_m26_standardwhite' of https://github.com/skodak/moodle