Merge pull request #25 from marinaglancy/wip-nov14-rubric
authorDavid Mudrak <david.mudrak@gmail.com>
Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)
committerDavid Mudrak <david.mudrak@gmail.com>
Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)
commit053d290c0dda4d5597f3cdafaa5d97df61ebe045
tree3e5cede150f47050ce4e73743d824d68a9747b9d
parent6f07a6a2ea674883cf480a2640707aa87683688f
parent3c2b3cb3eed177cc556aef462215d69bc52e0165
Merge pull request #25 from marinaglancy/wip-nov14-rubric