Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:07:47 +0000 (22:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:07:47 +0000 (22:07 +0200)
commit88e4c0848a04b9006ddfa620376182fa34793404
tree4510f82ced3831a5fd563cf3f2399126bc1d0ed1
parent37aa0545a1e69dc532fa92b89cbd7f6c7104f99c
parent7829d5d7c33f47bd3ffc1f64d33889cbf2426f4b
Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle