Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 06:27:33 +0000 (14:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 06:27:33 +0000 (14:27 +0800)
commit98b51f38828fccaa3d0a4f215e0e186f5ca2e1e7
treec3828f0b7bb653ee923446a87eee622381928705
parent90f9c88da2450205c09350d2b7ff6ce344fad224
parent4a521e6596918279fd0cdeb47d06e7906bc004cc
Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle