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)
commit1f4f0901d0fc3a6569b4f4768b936ba3aa3dbd10
treed1743833c52b9eacaab920f7c8cb1723dcbcb005
parentfb45f406a196f5e8fdf65d607300b60ffc940c16
parentbaf3d690720cb19df976b36002307e1f7d65ee3e
Merge branch 'w39_MDL-41904_m26_markdown' of https://github.com/skodak/moodle
lib/thirdpartylibs.xml
lib/weblib.php