Merge branch 'master' of https://github.com/CVC4/CVC4
authorKshitij Bansal <kshitij@cs.nyu.edu>
Sun, 6 Apr 2014 23:46:34 +0000 (19:46 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Sun, 6 Apr 2014 23:46:34 +0000 (19:46 -0400)

Trivial merge