Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 23 Jan 2013 22:07:11 +0000 (17:07 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 23 Jan 2013 22:07:11 +0000 (17:07 -0500)
commit3984e0df9dc739259271fd55ba0e814fa7b4fac1
tree8458cc612daf814c1aec8299fd7d69eb2e098dc2
parent7597eaaa1dd8eb384b3a2fd11774c4eae99a612f
parentfd29170106da3401dd183b479c84984a16ddcc41
Merge branch '1.0.x'

Conflicts:
NEWS