Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 20 Mar 2013 06:08:55 +0000 (14:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 20 Mar 2013 06:08:55 +0000 (14:08 +0800)
commitc2eb74df476db4c91d72230b109a6d865dea38df
tree1874d18e9f0074af01ee8d0f7ab21a326bbcd50c
parentf50867c42487e403ab97b9c2cfd0aa3c46f5cfad
parent006330243667f84e6701f5307afc9c373573a245
Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle

Conflicts:
lib/db/caches.php
version.php
lang/en/cache.php
lib/db/caches.php
lib/pluginlib.php
version.php