Merge branch 'wip-MDL-27427-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 04:04:06 +0000 (12:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 04:04:06 +0000 (12:04 +0800)
1  2 
blog/locallib.php

Simple merge