Merge branch 'MDL-41595_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
commit69253612e41e7d4350d52bc48b82f4bd44e6e1f1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:22 +0000 (17 02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:22 +0000 (17 02:15 +0200)
treea4f2bf2f10660c7b35bfce196f225b9ac7e9e613
parentb27ca3514ed22894151f27347d308441834579c1
parent29892d8739954010f640c988f6048bdc8c19ba09
Merge branch 'MDL-41595_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE