Merge branch 'w15_MDL-32365_m23_id' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 16:55:33 +0000 (18:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 16:55:33 +0000 (18:55 +0200)
commitb3312696873ca60d6d7feed9d931ad91eedebdf9
treecb3a5e333d30ce6bb42f05988b5e1f0f2785076c
parent3d83a9f5048d668b8c0b7e20064b4d30d568ced2
parent4bf855771fa17a681efdc7098e6d632438f516e9
Merge branch 'w15_MDL-32365_m23_id' of git://github.com/skodak/moodle