Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)
commit223d02a468b9dce15e28cd81b948ac5ed017beca
tree5c95afb73ac56f73fe585f704f903755acd57abc
parent4354486d30553d87830e5d89f9d1d601af859a00
parent178ba8bc365be4b44896058b7e23a3a926794396
Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle