Merge branch 'MDL-25708' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 13:21:53 +0000 (14:21 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 13:21:53 +0000 (14:21 +0100)
1  2 
message/lib.php
mod/resource/db/upgradelib.php

diff --cc message/lib.php
Simple merge
Simple merge