Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)
commit0dda790c05bcab5b57a624ac3f6b9c0229d1e47a
tree0260a0dcb9cfc49b851fbd191d260b5084eef92f
parent313cdd4fe4c01d4a1e65a04cb3424920807d4ae2
parent4d254790c4d572d80dc396d57d939a133c6080fe
Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle

Conflicts:
    lib/db/upgrade.php
version.php
lib/db/upgrade.php
lib/filelib.php
lib/moodlelib.php
lib/outputrenderers.php
user/editlib.php
version.php