Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 00:14:16 +0000 (12:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 00:14:16 +0000 (12:14 +1200)
1  2 
lib/thirdpartylibs.xml
lib/weblib.php

Simple merge
diff --cc lib/weblib.php
Simple merge