Merge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 05:46:11 +0000 (13:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 05:46:11 +0000 (13:46 +0800)
commit5c219bbc84aaa5134906e07a4ad3598f0d2f1400
tree336b24c3522d77a5ab506f5c3c04d6295577112a
parentd08598bc8b18491de7e04fa33840375093a12053
parent0d0514cf3beffc18bdaaf663deed4f6983f26a34
Merge branch 'w06_MDL-40921_m27_workshopevents' of https://github.com/skodak/moodle