Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 16:09:29 +0000 (18:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 16:09:29 +0000 (18:09 +0200)
commit58937f7e577c621fe10bed268d73da5b9357829c
treef25a8958a61eb6416c62d4e5de0b1199edbca03a
parentb2b9320570d5c63da7d2f38a092149529971f63d
parent9778dae374b10a825b8e500e36958b92a6b4e9ad
Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle