Git merges in Moodle 2.2.0 by David Mudrak
commit 053d290c0dda4d5597f3cdafaa5d97df61ebe045
Author: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 14 Nov 2011 16:20:16 +0800
Tag: v2.2.0-beta
Merge pull request #25 from marinaglancy/wip-nov14-rubric
commit 3e5e7004c5f56838008531af54b4a4d35021614b
Author: David Mudrak <david.mudrak@gmail.com>
Date: Tue, 08 Nov 2011 16:23:45 +0800
Tag: v2.2.0-beta
Merge pull request #24 from marinaglancy/wip-nov08-rubric
commit 903198de7b5cd00b86db38f0d3bd644047632cff
Author: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 07 Nov 2011 20:47:29 +0800
Tag: v2.2.0-beta
Merge pull request #23 from marinaglancy/wip-nov07-rubric
commit fa4cbd214bfe2a97f195280e9e1a6341c4f44786
Author: David Mudrak <david.mudrak@gmail.com>
Date: Fri, 04 Nov 2011 15:42:52 +0800
Tag: v2.2.0-beta
Merge pull request #22 from marinaglancy/wip-nov04_1-rubric
commit e14e78abbfcc0c938237d0b3ceb4a6ef4da43668
Author: David Mudrak <david.mudrak@gmail.com>
Date: Thu, 03 Nov 2011 17:52:53 +0800
Tag: v2.2.0-beta
Merge pull request #21 from marinaglancy/wip-nov03-rubric
commit d6d341d09bce44dc9c3ffc9c76889bbba8eed208
Author: David Mudrak <david@moodle.com>
Date: Thu, 03 Nov 2011 06:17:08 +0800
Tag: v2.2.0-beta
Merge remote branch 'origin/master' into rubric
commit ce7f5c8d3bd76e3f966e2b4c3b40bf706510f621
Author: David Mudrak <david.mudrak@gmail.com>
Date: Wed, 02 Nov 2011 18:41:12 +0800
Tag: v2.2.0-beta
Merge pull request #20 from marinaglancy/wip-nov02-rubric
commit 18dd4a69d0886587a52b633e6724a8b7c27effba
Author: David Mudrak <david@moodle.com>
Date: Fri, 28 Oct 2011 03:52:24 +0800
Tag: v2.2.0-beta
Merge remote branch 'origin/master' into rubric
commit 72e48ad28f53f486c76d6e4406a9830037efb426
Author: David Mudrak <david.mudrak@gmail.com>
Date: Thu, 27 Oct 2011 14:47:29 +0800
Tag: v2.2.0-beta
Merge pull request #17 from marinaglancy/wip-rubricrenderer-rubric
commit 01609c9ad94e5757cef2afc1ed637863cff83762
Author: David Mudrak <david@moodle.com>
Date: Tue, 25 Oct 2011 04:13:01 +0800
Tag: v2.2.0-beta
Merge remote branch 'origin/master' into rubric
commit 8b9ada5e195e94dc53ab6fefa2111d56b0cce2e7
Author: David Mudrak <david@moodle.com>
Date: Tue, 25 Oct 2011 03:02:56 +0800
Tag: v2.2.0-beta
Merge remote branch 'github/rubric' into rubric
commit d1bc8178326625d51fcd5d05559c3ed5a3877630
Author: David Mudrak <david.mudrak@gmail.com>
Date: Tue, 25 Oct 2011 02:59:08 +0800
Tag: v2.2.0-beta
Merge pull request #16 from marinaglancy/wip-MDL-29483-rubric
commit 6477706e9c0e60b458ce8d553da98f144bdb0915
Author: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 17 Oct 2011 17:54:53 +0800
Tag: v2.2.0-beta
Merge pull request #15 from marinaglancy/wip-renderer-rubric
commit 7ece4a07989b6ea2a9e72556898e700743a37385
Author: David Mudrak <david@moodle.com>
Date: Fri, 14 Oct 2011 04:43:28 +0800
Tag: v2.2.0-beta
Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric
commit 20c207ab2105235ae0d8d9cb246eb5f4212eaa98
Author: David Mudrak <david@moodle.com>
Date: Fri, 14 Oct 2011 04:42:47 +0800
Tag: v2.2.0-beta
Merge branch 'master' into rubric
commit ba2a25a816360c3a526e4197194014e2c5b6a93d
Author: David Mudrak <david.mudrak@gmail.com>
Date: Fri, 14 Oct 2011 04:24:37 +0800
Tag: v2.2.0-beta
Merge pull request #14 from marinaglancy/wip-MDL-29481-rubric
commit a5c4c99b24034db5eab416a7ff6a4fd50b29eaff
Author: David Mudrak <david.mudrak@gmail.com>
Date: Wed, 12 Oct 2011 16:06:27 +0800
Tag: v2.2.0-beta
Merge pull request #13 from marinaglancy/wip-formvalidation-rubric
commit 6abcb0c21f96bb63eec4bdd617c00e15e0577294
Author: David Mudrak <david@moodle.com>
Date: Wed, 12 Oct 2011 09:13:55 +0800
Tag: v2.2.0-beta
Merge remote branch 'origin/master' into rubric
commit 2824c44aecd82d7d44d98d875c54fe73378e634a
Author: David Mudrak <david@moodle.com>
Date: Wed, 12 Oct 2011 03:37:14 +0800
Tag: v2.2.0-beta
Merged Marina's recent work on rubric plugin
commit e8004aadc8e426f628a840d1ce396cb4be80b745
Author: David Mudrak <david@moodle.com>
Date: Sat, 08 Oct 2011 04:01:38 +0800
Tag: v2.2.0-beta
Merge remote branch 'origin/master' into rubric