From: Brian Norris <banorris@uci.edu>
Date: Wed, 3 Oct 2012 20:54:22 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=81ea453e58cbb85fddff3aa8919dfbc59c3140eb;p=cdsspec-compiler.git

Merge remote-tracking branch 'origin/master'
---

81ea453e58cbb85fddff3aa8919dfbc59c3140eb