Merge branch 'MDL-39448-master' of git://github.com/sammarshallou/moodle

Conflicts:
	cache/stores/memcache/version.php
This commit is contained in:
Dan Poltawski
2013-05-07 11:43:23 +01:00
4 changed files with 37 additions and 3 deletions
+2 -2
View File
@@ -26,6 +26,6 @@
defined('MOODLE_INTERNAL') || die;
$plugin->version = 2013050100; // The current module version (Date: YYYYMMDDXX)
$plugin->version = 2013050700; // The current module version (Date: YYYYMMDDXX)
$plugin->requires = 2013050100; // Requires this Moodle version.
$plugin->component = 'cachestore_memcache'; // Full name of the plugin.
$plugin->component = 'cachestore_memcache'; // Full name of the plugin.