Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 23 Jan 2012 22:57:57 +0000 (06:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 23 Jan 2012 22:57:57 +0000 (06:57 +0800)
commit5b80391fde91611e3f322c7dcf6c0af3d277fa9d
tree44b58fd6e8b86359ecaa44003454e8d37c439cd8
parentdee8d39f4d5b31d0cf65d6b7d8aa579c88a62017
parentb310a86e49119a7e3df8ec82ffc0f85d95b36d4f
Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle