Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:59:21 +0000 (01:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 00:59:21 +0000 (01:59 +0100)
commita1017ec83782c6a7b4f7ab9ed6ab441a5f300082
tree981302d04547fe16b490aefdb4be2e9589844ca9
parent0601a82aff380e5369fce4ce0ed91a4ae70c1e03
parent4b6b1e3a00f871c3e08704bdc27a30c24125fa25
Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle