Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 02:35:06 +0000 (10:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 02:35:06 +0000 (10:35 +0800)
commit36977d39d0e485ad9ec88d153de97f6b622b9a31
tree4fb15e04c06d2f792b0b70fa03c78efc1676da03
parent608132d7e4c410d1216a211a566408895902a33d
parent54867385b2b48e5cb35b6d6f26fb21c1e9140e6b
Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle