Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 20:24:20 +0000 (22:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 20:24:20 +0000 (22:24 +0200)
commitdd12051df2307b956b4eee3e6869f446a0137535
tree01aaefd66bc7249d7c0e9d803a4b37a1e27aaa93
parent77dd8ab1de70f459339e90e15af6037a1a439be1
parent14bcde673d35610dc2bb04486476f1f26e36eb05
Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle