Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 22:41:04 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 22:41:04 +0000 (00:41 +0200)
commit76b97631b0ca8b098836aca0bb37febb4b3f3a4f
tree6322503fd09867258c6af3f58bd01e260faa63af
parent267c898bfd6abe83291b455f6a74af9e79321dd5
parent6a2a055edc4723a6ef69bfb512ab22b6aa79e7a8
Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle

Conflicts:
lib/db/upgrade.php
version.php
blog/edit.php
blog/locallib.php
lang/en/admin.php
lib/db/upgrade.php
lib/filelib.php
lib/pluginlib.php
version.php