Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 04:16:59 +0000 (12:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 04:16:59 +0000 (12:16 +0800)
1  2 
blog/index.php

diff --cc blog/index.php
Simple merge