Merge branch 'MDL-37864-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 01:35:46 +0000 (09:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 01:35:46 +0000 (09:35 +0800)
commit641379401891fd3eb90087fe0b95d850721fc02d
treed3fda6ac12735f043624d7c5f4563e07815a65e1
parent819ab257f77fd41fa39eb36e81d88344a9f9942a
parentdd106c8824e96a1f8006f57059e8157c9d03ee46
Merge branch 'MDL-37864-master' of git://github.com/xow/moodle