Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 23:38:48 +0000 (00:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 23:38:48 +0000 (00:38 +0100)
commit90022d184e0961ff6cf665f26b3cc492011baa2e
treeed3212bb5ee9c8854b272f56de482c56cfaa7976
parentbccb64f172c490918e4e8dc6c0d39b756c57d77a
parent75c95c8b027bc70ddb139a018e30a46b16e142c5
Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle