Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:00:49 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:00:49 +0000 (20:00 +0200)
commit1333c05ebe02924fe5e34a9faa4291c37f3a5038
tree74d24c7176c84a2ae1b24a7d8892116aff84275c
parent3a4c390c53ac9b68710398c8bbf1c22b4b3b33fb
parent4de00da79112722e95fb6d939691342980856559
Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

Conflicts:
lib/db/services.php
version.php
lib/db/services.php
version.php