Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:49:34 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 06:49:34 +0000 (14:49 +0800)
commit95764ab7efad24b67bc00bc53f4e7dd7109f908c
tree57be60b9711329ea6823c8215c68f8c1dacfb160
parentd0fd9726d1663ed8aefb413398adfec6507e8d76
parentec130bda4ba46509e5d41583a2d863ef28de5a01
Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/upgrade.txt
theme/upgrade.txt