From: Brian Norris <banorris@uci.edu>
Date: Thu, 12 Jul 2012 18:18:00 +0000 (-0700)
Subject: Merge branch 'master' into brian
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=8548c711d71b6474802af83f5a4800eb4ac30718

Merge branch 'master' into brian
---

8548c711d71b6474802af83f5a4800eb4ac30718