Merge remote branch 'origin/master' into rubric
authorDavid Mudrak <david@moodle.com>
Wed, 12 Oct 2011 01:13:55 +0000 (03:13 +0200)
committerDavid Mudrak <david@moodle.com>
Wed, 12 Oct 2011 01:13:55 +0000 (03:13 +0200)
commit6abcb0c21f96bb63eec4bdd617c00e15e0577294
tree6bbe05666570ebcc7b60faaf5d45698413b06e9a
parentfe817d8799866704c1c2ba54a71d695b3616202d
parentb77088cd0483167b5c4d2d8419df6796d89b3676
Merge remote branch 'origin/master' into rubric