Merge branch 'MDL-25840' of git://github.com/nebgor/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 11 Apr 2011 11:31:45 +0000 (13:31 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 11 Apr 2011 11:31:45 +0000 (13:31 +0200)
1  2 
blog/locallib.php

Simple merge