Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2014 09:53:17 +0000 (10:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2014 09:53:17 +0000 (10:53 +0100)
commit5ecfa56512ed1861e8df23a69b501eaa6f634492
tree5ebb54f22d858b9c248e0ffc1f9f7bdb0d836cc8
parent845e11407f08461ce3a2a45ca7d092d6a2c83119
parenta964ead06d95e44d6c5a39cc25014e93aa36d2a4
Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle