Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict...
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 03:07:22 +0000 (11:07 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 03:07:22 +0000 (11:07 +0800)
commit9186cb7e984f9fe8f23012c62efe9a0dc4a9a666
treea72c11204390a0d60a0c18e5801419588cdb50ec
parent7bff5441c8b5f3d45edd4989cd03499a9594b983
parent8e265315191420540c8577cf0c1032bdcc0824e0
Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171
lang/en/admin.php
lang/en/message.php
lib/adminlib.php
lib/db/install.xml
lib/db/upgrade.php
version.php