Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:00:45 +0000 (12:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:00:45 +0000 (12:00 +0800)
commit0e84ecefcc098e1d1082da0468496a9ed03aab35
tree150100019d9dda056160fc125bd3e189d7ec8a3e
parentd306807e0280318520de945d180067ca73f422bd
parentfd0e01928644bd78bc5123883fd8b7feb72fd64d
Merge branch 'w07_MDL-42541_m27_portevent' of git://github.com/skodak/moodle

Conflicts:
version.php
lib/db/install.xml
lib/db/upgrade.php
version.php