Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 23:11:40 +0000 (18:11 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 23:11:40 +0000 (18:11 -0500)
commit17cf7ddc9613785a7bfb7d7957f1432a51dd137c
tree2f616fe021c4f67331fb0d910cf39e3a22b55cf6
parentaed7130284c04f7ada79db1ed3d4a8ddb08d3543
parentef0e079d85b18fd36b4d90be15b465e2316a38c9
Merge branch '1.0.x'
src/main/util.cpp