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)
commit717cabb7a44930834af477ee86ca55f47c2ec4b4
treece5da070c99a46ef1ce8bf9d2cb830835568f158
parent0bb0f086ac1b9ec5cf6e65d440353755f66f704f
parent1b30a9fac63bd000b908d5c786c420a9f672c283
Merge branch 'MDL-25347_master' of git://github.com/dmonllao/moodle
blog/lib.php