Merge branch 'w38_MDL-35062_m24_selfaction' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 16:57:39 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 16:57:39 +0000 (18:57 +0200)
commit5fe658fca987573d0e8cd494f34e2e6063317d64
tree3b1d7ecdc1d86fc5211ba49ea3417d70094dc3f2
parent8f75ffeba1c74c0448f608fd183352ae03c6387d
parent90bd89651ea672d8b8ea297c0c6098f1d28db0f6
Merge branch 'w38_MDL-35062_m24_selfaction' of git://github.com/skodak/moodle