Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 15:24:48 +0000 (17:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 15:24:48 +0000 (17:24 +0200)
commit60bf24f02420bd96c12585d72376f2ad856c4f99
tree86f6809cc7d815ff40d23c92a83545fa2d4b7ea6
parentaf4f1cc722919c6f1e7ac13d055272027e1c1127
parentf848c0f6e60c4451a0058d87194f326bca690c1e
Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle