Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)
commitdf9bdfb0004e6e331faf9968840f023f10ae6802
tree992d68bb2895d835f909c618add273dee69c9f2d
parent3b597dd4ee91e42d14b56d5d3f5955445e9f6d2a
parent6671fa735a3730085a3ee659897ce8b8b6978083
Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

Conflicts:
lib/upgrade.txt
lib/blocklib.php
lib/outputrenderers.php
lib/upgrade.txt
theme/mymobile/renderers.php
theme/upgrade.txt