Merge branch 'w13_MDL-26985_20_branching' of git://github.com/skodak/moodle into...
commit50496af78b3a604e1a58b1b90e2748cf13c8f1f6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 16:41:22 +0000 (28 18:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 16:41:22 +0000 (28 18:41 +0200)
treed698bacedb398a6cfa825ad9e33e5c6ead835e08
parent8fc52ccf461958d650f5f71912be2d53ceb336ef
parent7bb8ae5911947270c033bc8ccec4a2a489af33e5
Merge branch 'w13_MDL-26985_20_branching' of git://github.com/skodak/moodle into MOODLE_20_STABLE