Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

Conflicts:
	lib/db/services.php
	version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-29 20:00:49 +02:00
commit 1333c05ebe
3 changed files with 33 additions and 23 deletions

View file

@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();
$version = 2011062700.03; // YYYYMMDD = weekly release date of this DEV branch
$version = 2011062700.04; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes