Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:39:20 +0000 (13:39 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:39:20 +0000 (13:39 +0100)
commit1310964bb33daac4fdc0984f77a71ce292162f54
tree3b89c9d5ed98f796f57f8baf5a88229dbe31c2f4
parent8729e5999f8309a42785db6a1dcd8dbc758a5fb0
parent54672f15b4305a583710199eee3e4cf2a593d819
Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle

Conflicts:
mod/lesson/version.php
lib/datalib.php
mod/forum/lib.php