Merge branch 'wip-MDL-26014-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 27 Apr 2012 01:15:51 +0000 (03:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 27 Apr 2012 01:15:51 +0000 (03:15 +0200)
1  2 
lang/en/blog.php

Simple merge