Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:51:20 +0000 (13:51 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 05:51:20 +0000 (13:51 +0800)
commitbb9fd6b29d2aba4848ff21758d311e8dee204d3a
tree24e08ce7f0ce170e6dc12f4a9c1a344ded8270f5
parent5c5d182301723047964c91e5700c6f5cc0e98ef9
parentc10fa5da47eea318069c5a513b85727cf626f971
Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle
theme/upgrade.txt