Merge branch 'MDL-25347_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 00:03:52 +0000 (02:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 00:03:52 +0000 (02:03 +0200)
1  2 
blog/lib.php

diff --cc blog/lib.php
Simple merge