Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 08:57:29 +0000 (09:57 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 08:57:29 +0000 (09:57 +0100)

Trivial merge